Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2020-05-17 15:38:59 +0000
committerAlexander Kurtakov2020-06-11 01:45:03 +0000
commita712af208f8b8a7a17dc038def1ea419c401f181 (patch)
tree8132d58ba566f8d19e7eea274a96639549b73f72
parentbc65ba18320013100d819d58c8978142b533daa4 (diff)
downloadeclipse.platform.team-a712af208f8b8a7a17dc038def1ea419c401f181.tar.gz
eclipse.platform.team-a712af208f8b8a7a17dc038def1ea419c401f181.tar.xz
eclipse.platform.team-a712af208f8b8a7a17dc038def1ea419c401f181.zip
Remove unnecessary array creation for varargs
Change-Id: I500c5c41f9ded58d9361f831a7fa899ae92bdbf9 Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java2
-rw-r--r--bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java2
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Messages.java2
-rw-r--r--tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/DoNotRemoveTest.java7
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java3
8 files changed, 10 insertions, 15 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 7a1d7c04a..b16fee95a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -1100,7 +1100,7 @@ public class EditionSelectionDialog extends ResizableDialog {
fEditionTree.removeAll();
String pattern= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$
- String title= MessageFormat.format(pattern, new Object[] { ((Item)w).getText() });
+ String title= MessageFormat.format(pattern, ((Item)w).getText());
fEditionPane.setText(title);
Iterator<Object> iter= editions.iterator();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index a85efadd9..8740a897a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -818,7 +818,7 @@ public class Utilities {
for (Method method : methods) {
if (method.getName().equals("setReadTimeout")) { //$NON-NLS-1$
try {
- method.invoke(connection, new Object[] {Integer.valueOf(timeout)});
+ method.invoke(connection, Integer.valueOf(timeout));
return true;
} catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
// ignore
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
index 3f07bbe14..fffc477db 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
@@ -212,9 +212,8 @@ public class UnixProxyProvider extends AbstractProxyProvider {
private static String getEnv(String env) {
try {
- Method m = System.class.getMethod(
- "getenv", new Class[] { String.class }); //$NON-NLS-1$
- return (String) m.invoke(null, new Object[] { env });
+ Method m = System.class.getMethod("getenv", String.class); //$NON-NLS-1$
+ return (String) m.invoke(null, env);
} catch (Throwable t) {
// Fall-back to running 'env' directly. Warning this is very slow...
// up to 200ms
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
index 60eda0385..5b21f7a8a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
@@ -164,7 +164,7 @@ public class ConfigureSynchronizeScheduleComposite extends Composite {
});
hoursOrMinutes = new Combo(area, SWT.READ_ONLY);
- hoursOrMinutes.setItems(new String[] { TeamUIMessages.ConfigureRefreshScheduleDialog_5, TeamUIMessages.ConfigureRefreshScheduleDialog_6 }); //
+ hoursOrMinutes.setItems(TeamUIMessages.ConfigureRefreshScheduleDialog_5, TeamUIMessages.ConfigureRefreshScheduleDialog_6); //
hoursOrMinutes.setLayoutData(new GridData());
final Label label = new Label(area, SWT.WRAP);
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Messages.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Messages.java
index 1ff1b671e..cf0feb019 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Messages.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Messages.java
@@ -23,7 +23,7 @@ import java.text.MessageFormat;
public class Messages {
public static String format(String message, Object object) {
- return MessageFormat.format(message, new Object[] { object});
+ return MessageFormat.format(message, object);
}
public static String format(String message, Object[] objects) {
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/DoNotRemoveTest.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/DoNotRemoveTest.java
index 6e115af3f..73fa10c98 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/DoNotRemoveTest.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/DoNotRemoveTest.java
@@ -38,8 +38,7 @@ public class DoNotRemoveTest extends TeamTest {
*/
public void test_Utils_updateLabels() {
try {
- Method method = Utils.class.getMethod("updateLabels", new Class[] {
- SyncInfo.class, CompareConfiguration.class });
+ Method method = Utils.class.getMethod("updateLabels", SyncInfo.class, CompareConfiguration.class);
assertEquals(Modifier.STATIC | Modifier.PUBLIC,
method.getModifiers());
assertEquals(Void.TYPE, method.getReturnType());
@@ -56,9 +55,7 @@ public class DoNotRemoveTest extends TeamTest {
*/
public void testBug312217() {
try {
- Method method = CompareRevisionAction.class.getMethod(
- "findReusableCompareEditor",
- new Class[] { IWorkbenchPage.class });
+ Method method = CompareRevisionAction.class.getMethod("findReusableCompareEditor", IWorkbenchPage.class);
assertEquals(Modifier.STATIC | Modifier.PUBLIC,
method.getModifiers());
assertEquals(IEditorPart.class, method.getReturnType());
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index 6c22b010d..f427cd319 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -162,7 +162,7 @@ public class EclipseTest extends ResourceTest {
return new CVSTestSetup(suite);
} else {
try {
- return new CVSTestSetup((Test) c.getConstructor(new Class[] { String.class }).newInstance(new Object[] {testName}));
+ return new CVSTestSetup((Test) c.getConstructor(new Class[] { String.class }).newInstance(testName));
} catch (Exception e) {
fail(e.getMessage());
// Above will throw so below is never actually reached
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java
index 464826489..0f36e3861 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java
@@ -248,8 +248,7 @@ public class PatchWizardRadioButtonGroupTests extends TestCase {
.forName("org.eclipse.team.internal.ccvs.ui.wizards.GenerateDiffFileWizard$RadioButtonGroup");
Constructor<?>[] constructors = clazz.getDeclaredConstructors();
constructors[0].setAccessible(true);
- groupObject = constructors[0]
- .newInstance(new Object[] { wizard });
+ groupObject = constructors[0].newInstance(wizard);
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
fail(e.getMessage());
}

Back to the top