Remove unnecessary array creation for varargs
Using the batch cleanup operation via Source -> Cleanup -> "Remove
unnecessary array creation for varargs " from standard JDT.
Change-Id: I272ad537b0e196020095c516bd7dc205160f0bce
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
index 3f6c071..f6abaff 100644
--- a/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
+++ b/bundles/org.eclipse.e4.tools.compat/src/org/eclipse/e4/tools/compat/internal/PartHelper.java
@@ -47,7 +47,7 @@
final Class<?> clazz = Platform.getBundle("org.eclipse.e4.ui.model.workbench").loadClass( //$NON-NLS-1$
"org.eclipse.e4.ui.model.application.ui.basic.MPart"); //$NON-NLS-1$
final Object instance = site.getService(clazz);
- final Method m = clazz.getMethod("getContext", new Class[0]); //$NON-NLS-1$
+ final Method m = clazz.getMethod("getContext"); //$NON-NLS-1$
IEclipseContext ctx = (IEclipseContext) m.invoke(instance);
final IEclipseContext rv = ctx;
while (ctx.getParent() != null) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
index dddd16a..0f499ff 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/ListTab.java
@@ -466,7 +466,7 @@
public void widgetSelected(SelectionEvent e) {
filterByItemName = null;
filterByAttrName = null;
- tvResults.setFilters(new ViewerFilter[0]);
+ tvResults.setFilters();
filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
filterByAttribute.setText(Messages.ListTab_markAttribute + ELIPSIS);
}
@@ -896,7 +896,7 @@
}
};
- tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+ tvResults.setFilters(viewerFilter);
filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS + "(" + filterByItemName + ")"); //$NON-NLS-1$//$NON-NLS-2$
filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS);
}
@@ -941,7 +941,7 @@
}
}
};
- tvResults.setFilters(new ViewerFilter[] { viewerFilter });
+ tvResults.setFilters(viewerFilter);
filterByAttribute.setText(Messages.ListTab_filterByAttribute + ELIPSIS + "(" + filterByAttrName + ")"); //$NON-NLS-1$//$NON-NLS-2$
filterByItem.setText(Messages.ListTab_filterByItem + ELIPSIS);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
index 9ca937e..94e2143 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/tabs/empty/TitleAreaFilterDialog.java
@@ -71,13 +71,12 @@
viewer.setLabelProvider(labelProvider);
viewer.setContentProvider(ArrayContentProvider.getInstance());
- viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
-
+ viewer.setFilters(new ViewerFilter() {
@Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
return isFiltered(element, text.getText());
}
- } });
+ });
text.addModifyListener(e -> viewer.refresh());
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
index f47950b..c6659b8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/FindContributionDialog.java
@@ -231,13 +231,11 @@
}
});
- viewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
-
+ viewer.setFilters(new ViewerFilter() {
@Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
ContributionData cd = (ContributionData) element;
- if ("show-bundles".equals(mode)) { //$NON-NLS-1$
- // only add first item from each bundle
+ if ("show-bundles".equals(mode)) {
boolean found = false;
for (Iterator<?> it = list.iterator(); it.hasNext();) {
ContributionData cd2 = (ContributionData) it.next();
@@ -250,27 +248,26 @@
}
}
return true;
- } else if ("show-packages".equals(mode)) { //$NON-NLS-1$
+ } else if ("show-packages".equals(mode)) {
if (bundleFilter != null && bundleFilter.isEmpty() == false) {
if (!bundleFilter.equals(cd.bundleName)) {
return false;
}
}
String packageName;
- int last = cd.className.lastIndexOf("."); //$NON-NLS-1$
+ int last = cd.className.lastIndexOf(".");
if (last >= 0) {
packageName = cd.className.substring(0, last);
} else {
- packageName = ""; //$NON-NLS-1$
+ packageName = "";
}
- // only add first item from each package
boolean found = false;
for (Iterator<?> it = list.iterator(); it.hasNext();) {
boolean matches = false;
ContributionData cd2 = (ContributionData) it.next();
- if (packageName.isEmpty() && cd2.className.contains(".") == false) { //$NON-NLS-1$
+ if (packageName.isEmpty() && cd2.className.contains(".") == false) {
matches = true;
- } else if (cd2.className.startsWith(packageName + ".")) { //$NON-NLS-1$
+ } else if (cd2.className.startsWith(packageName + ".")) {
matches = true;
}
if (matches) {
@@ -282,7 +279,7 @@
}
}
return true;
- } else if ("show-icons".equals(mode)) { //$NON-NLS-1$
+ } else if ("show-icons".equals(mode)) {
if (cd.iconPath == null) {
return false;
}
@@ -292,7 +289,7 @@
}
}
if (packageFilter != null && packageFilter.isEmpty() == false) {
- if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+ if (!cd.className.startsWith(packageFilter + ".")) {
return false;
}
}
@@ -304,15 +301,14 @@
}
}
if (packageFilter != null && packageFilter.isEmpty() == false) {
- if (!cd.className.startsWith(packageFilter + ".")) { //$NON-NLS-1$
+ if (!cd.className.startsWith(packageFilter + ".")) {
return false;
}
}
-
return true;
}
}
- } });
+ });
StringBuilder sbFind = new StringBuilder();
diff --git a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
index d5e855c..56132a3 100644
--- a/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
+++ b/bundles/org.eclipse.e4.tools/src/org/eclipse/e4/internal/tools/wizards/classes/AbstractNewClassPage.java
@@ -457,7 +457,7 @@
dialog.setHelpAvailable(false);
final IPackageFragment pack = clazz.getPackageFragment();
if (pack != null) {
- dialog.setInitialSelections(new Object[] { pack });
+ dialog.setInitialSelections(pack);
}
if (dialog.open() == Window.OK) {
