Use lambdas where possible
Using the batch cleanup operation via Source -> Cleanup -> "Use lambdas
where possible" from standard JDT.
Change-Id: I918f2c5908f3898eeeb89d0acf9fd88989ffc50b
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/CreateApiFilterOperation.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/CreateApiFilterOperation.java
index aa16a4e..effe8bd 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/CreateApiFilterOperation.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/CreateApiFilterOperation.java
@@ -92,31 +92,28 @@
HashSet<IProject> projects = new HashSet<>();
if (fAddingComment) {
- getDisplay().syncExec(new Runnable() {
- @Override
- public void run() {
- InputDialog dialog = new InputDialog(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- MarkerMessages.CreateApiFilterOperation_add_filter_comment,
- MarkerMessages.CreateApiFilterOperation_filter_comment, null, null) {
+ getDisplay().syncExec(() -> {
+ InputDialog dialog = new InputDialog(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ MarkerMessages.CreateApiFilterOperation_add_filter_comment,
+ MarkerMessages.CreateApiFilterOperation_filter_comment, null, null) {
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- getButton(IDialogConstants.OK_ID).setText(IDialogConstants.PROCEED_LABEL);
- }
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ super.createButtonsForButtonBar(parent);
+ getButton(IDialogConstants.OK_ID).setText(IDialogConstants.PROCEED_LABEL);
+ }
- };
- int okCancel = dialog.open();
- if (okCancel == IDialogConstants.OK_ID) {
- comment = dialog.getValue();
- if (comment != null && comment.length() < 1) {
- comment = null;
- }
+ };
+ int okCancel = dialog.open();
+ if (okCancel == IDialogConstants.OK_ID) {
+ comment = dialog.getValue();
+ if (comment != null && comment.length() < 1) {
+ comment = null;
}
- if (okCancel == IDialogConstants.CANCEL_ID) {
- cancel = true;
- }
+ }
+ if (okCancel == IDialogConstants.CANCEL_ID) {
+ cancel = true;
}
});
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
index a492fcd..74d2bd6 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
@@ -268,12 +268,7 @@
}
// Unjarred bundle, search for the built jar at the root of the folder
- File[] files = bundleFile.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.contains(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER);
- }
- });
+ File[] files = bundleFile.listFiles((FilenameFilter) (dir, name) -> name.contains(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER));
for (File file : files) {
if (file.isFile()) {
return file.getPath();
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
index a633395..760119b 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/PDEPreferencesTestCase.java
@@ -16,7 +16,6 @@
import junit.framework.TestCase;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.pde.internal.core.PDEPreferencesManager;
@@ -69,13 +68,9 @@
final String key = "stringKey";
String originalValue = preferences.get(key, key);
- IPreferenceChangeListener listener = new IPreferenceChangeListener(){
-
- @Override
- public void preferenceChange(PreferenceChangeEvent event) {
- assertEquals(event.getKey(), key);
- assertEquals(event.getNewValue(), "stringValue");
- }
+ IPreferenceChangeListener listener = event -> {
+ assertEquals(event.getKey(), key);
+ assertEquals(event.getNewValue(), "stringValue");
};
preferences.addPreferenceChangeListener(listener);
preferences.put(key, "stringValue");
@@ -93,14 +88,10 @@
preferences.put(key, "oldStringValue");
- IPreferenceChangeListener listener = new IPreferenceChangeListener(){
-
- @Override
- public void preferenceChange(PreferenceChangeEvent event) {
- assertEquals(event.getKey(), key);
- assertEquals(event.getOldValue(), "oldStringValue");
- assertEquals(event.getNewValue(), "newStringValue");
- }
+ IPreferenceChangeListener listener = event -> {
+ assertEquals(event.getKey(), key);
+ assertEquals(event.getOldValue(), "oldStringValue");
+ assertEquals(event.getNewValue(), "newStringValue");
};
preferences.put(key, "newStringValue");
preferences.removePreferenceChangeListener(listener);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
index 52e96f9..7932de2 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
@@ -125,10 +125,7 @@
}
protected IDocumentSetupParticipant getDocumentSetupParticipant() {
- return new IDocumentSetupParticipant() {
- @Override
- public void setup(IDocument document) {
- }
+ return document -> {
};
}
@@ -145,20 +142,17 @@
fDocumentProvider.connect(fEditorInput);
fModel = createModel(fEditorInput);
if (fModel instanceof IModelChangeProvider) {
- fModelListener = new IModelChangedListener() {
- @Override
- public void modelChanged(IModelChangedEvent e) {
- if (e.getChangeType() != IModelChangedEvent.WORLD_CHANGED) {
- if (!fEditor.getLastDirtyState())
- fEditor.fireSaveNeeded(fEditorInput, true);
- IModelChangeProvider provider = e.getChangeProvider();
- if (provider instanceof IEditingModel) {
- // this is to guard against false notifications
- // when a revert operation is performed, focus is taken away from a FormEntry
- // and a text edit operation is falsely requested
- if (((IEditingModel) provider).isDirty())
- addTextEditOperation(fEditOperations, e);
- }
+ fModelListener = e -> {
+ if (e.getChangeType() != IModelChangedEvent.WORLD_CHANGED) {
+ if (!fEditor.getLastDirtyState())
+ fEditor.fireSaveNeeded(fEditorInput, true);
+ IModelChangeProvider provider = e.getChangeProvider();
+ if (provider instanceof IEditingModel) {
+ // this is to guard against false notifications
+ // when a revert operation is performed, focus is taken away from a FormEntry
+ // and a text edit operation is falsely requested
+ if (((IEditingModel) provider).isDirty())
+ addTextEditOperation(fEditOperations, e);
}
}
};
diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
index 4ae0512..7daf74f 100644
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
+++ b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/internal/ui/samples/SampleOperation.java
@@ -66,31 +66,28 @@
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
- ICoreRunnable op = new ICoreRunnable() {
- @Override
- public void run(IProgressMonitor monitor) throws CoreException {
- IConfigurationElement[] projects = sample.getChildren("project"); //$NON-NLS-1$
- SubMonitor subMonitor = SubMonitor.convert(monitor, PDEUIMessages.SampleOperation_creating,
- projects.length);
- createdProjects = new IProject[projects.length];
- try {
- for (int i = 0; i < projects.length; i++) {
- IFile file = importProject(projectNames[i], projects[i],
- subMonitor.split(1));
- if (file != null && sampleManifest == null)
- sampleManifest = file;
- if (file != null) {
- createdProjects[i] = file.getProject();
- }
- if (cancel)
- // if user has cancelled operation, exit.
- break;
+ ICoreRunnable op = monitor1 -> {
+ IConfigurationElement[] projects = sample.getChildren("project"); //$NON-NLS-1$
+ SubMonitor subMonitor = SubMonitor.convert(monitor1, PDEUIMessages.SampleOperation_creating,
+ projects.length);
+ createdProjects = new IProject[projects.length];
+ try {
+ for (int i = 0; i < projects.length; i++) {
+ IFile file = importProject(projectNames[i], projects[i],
+ subMonitor.split(1));
+ if (file != null && sampleManifest == null)
+ sampleManifest = file;
+ if (file != null) {
+ createdProjects[i] = file.getProject();
}
- } catch (InterruptedException e) {
- throw new OperationCanceledException();
- } catch (InvocationTargetException e) {
- throwCoreException(e);
+ if (cancel)
+ // if user has cancelled operation, exit.
+ break;
}
+ } catch (InterruptedException e1) {
+ throw new OperationCanceledException();
+ } catch (InvocationTargetException e2) {
+ throwCoreException(e2);
}
};
PDEPlugin.getWorkspace().run(op, monitor);
