aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-08-19 09:58:37 -0400
committerDani Megert2013-08-19 09:58:37 -0400
commit3d5654b4fd466151f23768143514408b61707bf3 (patch)
tree93559a7945e447268784edc390060cb1d919f709
parentd1cadd0e4acc34a524095231103920594459f868 (diff)
downloadeclipse.platform.ui-3d5654b4fd466151f23768143514408b61707bf3.zip
eclipse.platform.ui-3d5654b4fd466151f23768143514408b61707bf3.tar.gz
eclipse.platform.ui-3d5654b4fd466151f23768143514408b61707bf3.tar.xz
Fixed bug 415342: Compile warnings in 'org.eclipse.ui.workbench'
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java4
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java6
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java8
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java22
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java4
5 files changed, 22 insertions, 22 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
index 0642029..cdc671d 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/PreferenceLinkArea.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,7 +65,7 @@ public class PreferenceLinkArea extends Object {
result = NLS.bind(
WorkbenchMessages.PreferenceNode_NotFound, pageId);
} else {
- result = MessageFormat.format(message, new String[] { node
+ result = MessageFormat.format(message, (Object[]) new String[] { node
.getLabelText() });
//Only add the selection listener if the node is found
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
index c21f489..4c114eb 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ProductProperties.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -244,7 +244,7 @@ public class ProductProperties extends BrandingProperties implements
return property;
}
String[] mappings = getMappings(product.getDefiningBundle());
- return MessageFormat.format(property, mappings);
+ return MessageFormat.format(property, (Object[]) mappings);
}
/**
@@ -281,7 +281,7 @@ public class ProductProperties extends BrandingProperties implements
}
}
- return MessageFormat.format(property, tempMappings);
+ return MessageFormat.format(property, (Object[]) tempMappings);
}
/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java
index 47f3978..eac1778 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/SelectAllHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -77,7 +77,7 @@ public class SelectAllHandler extends WidgetMethodHandler {
public void run() {
try {
methodToExecute.invoke(focusComponent,
- null);
+ (Object[]) null);
// and back to the UI thread :-)
focusControl.getDisplay().asyncExec(
new Runnable() {
@@ -131,7 +131,7 @@ public class SelectAllHandler extends WidgetMethodHandler {
}
} else if (numParams == 0) {
// This is a no-argument selectAll method.
- methodToExecute.invoke(focusControl, null);
+ methodToExecute.invoke(focusControl, (Object[]) null);
focusControl.notifyListeners(SWT.Selection, null);
} else if (numParams == 1) {
@@ -139,7 +139,7 @@ public class SelectAllHandler extends WidgetMethodHandler {
final Method textLimitAccessor = focusControl.getClass()
.getMethod("getTextLimit", NO_PARAMETERS); //$NON-NLS-1$
final Integer textLimit = (Integer) textLimitAccessor
- .invoke(focusControl, null);
+ .invoke(focusControl, (Object[]) null);
final Object[] parameters = { new Point(0, textLimit
.intValue()) };
methodToExecute.invoke(focusControl, parameters);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java
index d72b354..93b964b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/WidgetMethodHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -97,7 +97,7 @@ public class WidgetMethodHandler extends AbstractHandler implements
public void run() {
try {
methodToExecute.invoke(focusComponent,
- null);
+ (Object[]) null);
} catch (final IllegalAccessException e) {
// The method is protected, so do
// nothing.
@@ -139,7 +139,7 @@ public class WidgetMethodHandler extends AbstractHandler implements
} else {
- methodToExecute.invoke(focusControl, null);
+ methodToExecute.invoke(focusControl, (Object[]) null);
}
} catch (IllegalAccessException e) {
@@ -210,26 +210,26 @@ public class WidgetMethodHandler extends AbstractHandler implements
if (keyboardFocusManagerClass != null) {
// Use JRE 1.4 API
final Method keyboardFocusManagerGetCurrentKeyboardFocusManagerMethod = keyboardFocusManagerClass
- .getMethod("getCurrentKeyboardFocusManager", null); //$NON-NLS-1$
+ .getMethod("getCurrentKeyboardFocusManager", (Class[]) null); //$NON-NLS-1$
final Object keyboardFocusManager = keyboardFocusManagerGetCurrentKeyboardFocusManagerMethod
- .invoke(keyboardFocusManagerClass, null);
+ .invoke(keyboardFocusManagerClass, (Object[]) null);
final Method keyboardFocusManagerGetFocusOwner = keyboardFocusManagerClass
- .getMethod("getFocusOwner", null); //$NON-NLS-1$
+ .getMethod("getFocusOwner", (Class[]) null); //$NON-NLS-1$
final Object focusComponent = keyboardFocusManagerGetFocusOwner
- .invoke(keyboardFocusManager, null);
+ .invoke(keyboardFocusManager, (Object[]) null);
return focusComponent;
}
// Use JRE 1.3 API
final Class focusManagerClass = Class
.forName("javax.swing.FocusManager"); //$NON-NLS-1$
final Method focusManagerGetCurrentManagerMethod = focusManagerClass
- .getMethod("getCurrentManager", null); //$NON-NLS-1$
+ .getMethod("getCurrentManager", (Class[]) null); //$NON-NLS-1$
final Object focusManager = focusManagerGetCurrentManagerMethod
- .invoke(focusManagerClass, null);
+ .invoke(focusManagerClass, (Object[]) null);
final Method focusManagerGetFocusOwner = focusManagerClass
- .getMethod("getFocusOwner", null); //$NON-NLS-1$
+ .getMethod("getFocusOwner", (Class[]) null); //$NON-NLS-1$
final Object focusComponent = focusManagerGetFocusOwner
- .invoke(focusManager, null);
+ .invoke(focusManager, (Object[]) null);
return focusComponent;
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
index 62ca54d..7b01f54 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -398,7 +398,7 @@ public abstract class WorkbenchPart extends EventManager implements
if (!Util.equals(description, "")) { //$NON-NLS-1$
newTitle = MessageFormat
.format(
- WorkbenchMessages.WorkbenchPart_AutoTitleFormat, new String[] { name, description });
+ WorkbenchMessages.WorkbenchPart_AutoTitleFormat, (Object[]) new String[] { name, description });
}
setTitle(newTitle);