Use method reference instead of lambdas in pde.ui
Method references are slightly faster than lambdas and better readable.
Change-Id: I7477e418895e12d30aeac68a6d50ecee9203ae6f
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
index 981b84f..ae89a51 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/commands/CommandList.java
@@ -81,7 +81,7 @@
@Override
public void dispose() {
- fImgMap.values().forEach(obj -> obj.dispose());
+ fImgMap.values().forEach(org.eclipse.swt.graphics.Resource::dispose);
if (fDefaultImage != null)
fDefaultImage.dispose();
super.dispose();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
index 3771872..6e52eca 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
@@ -231,7 +231,7 @@
protected void createPages() {
clipboard = new Clipboard(getContainer().getDisplay());
MenuManager manager = new MenuManager();
- IMenuListener listener = manager1 -> contextMenuAboutToShow(manager1);
+ IMenuListener listener = this::contextMenuAboutToShow;
manager.setRemoveAllWhenShown(true);
manager.addMenuListener(listener);
fContextMenu = manager.createContextMenu(getContainer());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
index af2fa1a..b645f53 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
@@ -186,7 +186,7 @@
protected ISortableContentOutlinePage createOutlinePage() {
SourceOutlinePage sourceOutlinePage = new SourceOutlinePage(fEditor, (IEditingModel) getInputContext().getModel(), createOutlineLabelProvider(), createOutlineContentProvider(), createDefaultOutlineComparator(), createOutlineComparator());
fOutlinePage = sourceOutlinePage;
- fOutlineSelectionChangedListener = event -> updateSelection(event);
+ fOutlineSelectionChangedListener = this::updateSelection;
fOutlinePage.addSelectionChangedListener(fOutlineSelectionChangedListener);
getSelectionProvider().addSelectionChangedListener(sourceOutlinePage);
fEditorSelectionChangedListener = new PDESourcePageChangedListener();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
index 081ca2a..0fd997c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
@@ -57,7 +57,7 @@
protected void createViewerPartControl(Composite parent, int style, int span, FormToolkit toolkit) {
fViewerPart.createControl(parent, style, span, toolkit);
MenuManager popupMenuManager = new MenuManager();
- IMenuListener listener = mng -> fillContextMenu(mng);
+ IMenuListener listener = this::fillContextMenu;
popupMenuManager.addMenuListener(listener);
popupMenuManager.setRemoveAllWhenShown(true);
Control control = fViewerPart.getControl();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
index 28ff209..02b4758 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
@@ -107,7 +107,7 @@
@Override
protected void createViewerPartControl(Composite parent, int style, int span, FormToolkit toolkit) {
MenuManager popupMenuManager = new MenuManager();
- IMenuListener listener = mng -> fillContextMenu(mng);
+ IMenuListener listener = this::fillContextMenu;
popupMenuManager.addMenuListener(listener);
popupMenuManager.setRemoveAllWhenShown(true);
Control control = fTreeViewer.getControl();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
index a71ae41..fc2930f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourceViewerConfiguration.java
@@ -159,7 +159,7 @@
fAssignmentToken = new Token(createTextAttribute(PreferenceConstants.PROPERTIES_FILE_COLORING_ASSIGNMENT));
rules[1] = new WordRule(new AssignmentDetector(), fAssignmentToken);
- rules[2] = new WhitespaceRule(c -> Character.isWhitespace(c));
+ rules[2] = new WhitespaceRule(Character::isWhitespace);
setRules(rules);
setDefaultReturnToken(new Token(createTextAttribute(PreferenceConstants.PROPERTIES_FILE_COLORING_VALUE)));
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
index 2dab984..c309a21 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
@@ -324,7 +324,7 @@
MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(manager -> fillLibraryContextMenu(manager));
+ menuMgr.addMenuListener(this::fillLibraryContextMenu);
fLibraryViewer.getControl().setMenu(menuMgr.createContextMenu(fLibraryViewer.getControl()));
}
@@ -345,7 +345,7 @@
MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(manager -> fillFolderViewerContextMenu(manager));
+ menuMgr.addMenuListener(this::fillFolderViewerContextMenu);
fFolderViewer.getControl().setMenu(menuMgr.createContextMenu(fFolderViewer.getControl()));
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/ManifestContentAssistProcessor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/ManifestContentAssistProcessor.java
index fc47a46..6786702 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/ManifestContentAssistProcessor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/contentassist/ManifestContentAssistProcessor.java
@@ -73,7 +73,7 @@
fExecEnvs = new String[envs.length];
for (int i = 0; i < envs.length; i++)
fExecEnvs[i] = envs[i].getId();
- Arrays.sort(fExecEnvs, (o1, o2) -> o1.compareToIgnoreCase(o2));
+ Arrays.sort(fExecEnvs, String::compareToIgnoreCase);
}
/**
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
index 8d2d8f5..867fa66 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
@@ -346,7 +346,7 @@
@Override
public boolean doGlobalAction(String actionId) {
if (actionId.equals(ActionFactory.DELETE.getId())) {
- BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(), () -> handleDelete());
+ BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(), this::handleDelete);
return true;
}
if (actionId.equals(ActionFactory.CUT.getId())) {
@@ -360,7 +360,7 @@
return true;
}
if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
- BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(), () -> handleSelectAll());
+ BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(), this::handleSelectAll);
return true;
}
return false;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
index 65d8511..f48cef6 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
@@ -63,7 +63,7 @@
@Override
protected void browse() {
- BusyIndicator.showWhile(text.getDisplay(), () -> doOpenSelectionDialog());
+ BusyIndicator.showWhile(text.getDisplay(), this::doOpenSelectionDialog);
}
private JavaAttributeValue createJavaAttributeValue(String name) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
index 8337537..a7d0604 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
@@ -217,7 +217,7 @@
@Override
public boolean doGlobalAction(String actionId) {
if (actionId.equals(ActionFactory.DELETE.getId())) {
- BusyIndicator.showWhile(fTable.getDisplay(), () -> handleDelete());
+ BusyIndicator.showWhile(fTable.getDisplay(), this::handleDelete);
return true;
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
index ff1c79e..6712ab3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
@@ -236,7 +236,7 @@
private void ensureContentSaved() {
if (isDirty()) {
try {
- IRunnableWithProgress op = monitor -> doSave(monitor);
+ IRunnableWithProgress op = this::doSave;
PlatformUI.getWorkbench().getProgressService().runInUI(PDEPlugin.getActiveWorkbenchWindow(), op, PDEPlugin.getWorkspace().getRoot());
} catch (InvocationTargetException e) {
PDEPlugin.logException(e);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
index aa567f0..c30195c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
@@ -276,7 +276,7 @@
if (LOCALES_INITIALIZED)
return;
// kick off thread in background to find the NL values
- new Thread(() -> initializeAllLocales()).start();
+ new Thread(this::initializeAllLocales).start();
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
index 99ec63e..15d7996 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java
@@ -85,7 +85,7 @@
private ImageHyperlink fLoadHyperlink;
- private EventHandler fEventHandler = e -> handleBrokerEvent(e);
+ private EventHandler fEventHandler = this::handleBrokerEvent;
@Override
protected FormToolkit createToolkit(Display display) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
index 28ad603..d77692c 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/TextValidator.java
@@ -74,7 +74,7 @@
}
protected void createListeners() {
- fModifyListener = e -> handleModifyTextEvent(e);
+ fModifyListener = this::handleModifyTextEvent;
}
protected void handleModifyTextEvent(ModifyEvent e) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
index f709041..58ff403 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
@@ -786,8 +786,8 @@
Set<String> additionalIds = DependencyManager.getDependencies(toCheck.toArray(),
fIncludeOptionalButton.getSelection(), null);
- additionalIds.stream().map(id -> PluginRegistry.findEntry(id))
- .filter(Objects::nonNull).map(entry -> entry.getModel())
+ additionalIds.stream().map(org.eclipse.pde.core.plugin.PluginRegistry::findEntry)
+ .filter(Objects::nonNull).map(org.eclipse.pde.core.plugin.ModelEntry::getModel)
.forEach(model -> toCheck.add(model));
checked = toCheck.toArray();
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
index 571239e..7b00f53 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
@@ -216,7 +216,7 @@
String key = (String) keys.nextElement();
keyArray[i++] = key;
}
- Arrays.sort(keyArray, (o1, o2) -> compareKeys(o1, o2));
+ Arrays.sort(keyArray, this::compareKeys);
return keyArray;
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
index 04ff374..4e624da 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
@@ -239,7 +239,7 @@
GridData gd = new GridData(GridData.FILL_BOTH);
gd.heightHint = 250;
fInputViewer.getTree().setLayoutData(gd);
- fInputViewer.addSelectionChangedListener(event -> handleSelectionChanged(event));
+ fInputViewer.addSelectionChangedListener(this::handleSelectionChanged);
fInputViewer.addCheckStateListener(event -> setPageComplete(hasCheckedElements()));
fInputViewer.setComparator(ListUtil.PLUGIN_COMPARATOR);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
index 24165d2..ffafea3 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
@@ -184,7 +184,7 @@
}
public Image getImageFromPlugin(String bundleID, String path) {
- return ResourceLocator.imageDescriptorFromBundle(bundleID, path).map(d-> get(d)).orElse(getBlankImage());
+ return ResourceLocator.imageDescriptorFromBundle(bundleID, path).map(this::get).orElse(getBlankImage());
}
public Image getImageFromPlugin(IPluginModelBase model, String relativePath) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
index e4e4483..b5fa95f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
@@ -283,7 +283,7 @@
private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(manager -> DependenciesViewPage.this.fillContextMenu(manager));
+ menuMgr.addMenuListener(DependenciesViewPage.this::fillContextMenu);
Menu menu = menuMgr.createContextMenu(fViewer.getControl());
fViewer.getControl().setMenu(menu);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
index 0230407..5b62aad 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java
@@ -580,7 +580,7 @@
private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(manager -> PluginsView.this.fillContextMenu(manager));
+ menuMgr.addMenuListener(PluginsView.this::fillContextMenu);
Menu menu = menuMgr.createContextMenu(fTreeViewer.getControl());
fTreeViewer.getControl().setMenu(menu);
getSite().registerContextMenu(menuMgr, fTreeViewer);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
index 7486e04..e51d20d 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
@@ -394,7 +394,7 @@
private void hookContextMenu() {
MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(manager -> fillContextMenu(manager));
+ menuMgr.addMenuListener(this::fillContextMenu);
Menu menu = menuMgr.createContextMenu(fTreeViewer.getControl());
fTreeViewer.getControl().setMenu(menu);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java
index bc96d1c..2abb5da 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java
@@ -27,7 +27,7 @@
public class ListUtil {
- private static final Comparator<String> stringComparator = (arg0, arg1) -> arg0.compareToIgnoreCase(arg1);
+ private static final Comparator<String> stringComparator = String::compareToIgnoreCase;
static class NameComparator extends ViewerComparator {
public NameComparator() {
