Bug 564416 - lambdas and method cleanup on org.eclipse.jdt.junitI20200628-1800I20200626-1800

Change-Id: I94411e32cd205d0e82dc1b4a223704e7f259bf97
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

30 files changed, 271 insertions, 532 deletions

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/ClasspathVariableMarkerResolutionGenerator.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/ClasspathVariableMarkerResolutionGenerator.java
index e87bcc0a5c..38f4db04d5 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/ClasspathVariableMarkerResolutionGenerator.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/ClasspathVariableMarkerResolutionGenerator.java
@@ -19,13 +19,11 @@ import java.lang.reflect.InvocationTargetException;
 import org.eclipse.swt.graphics.Image;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 
 import org.eclipse.core.resources.IMarker;
 
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.ui.IMarkerResolution;
 import org.eclipse.ui.IMarkerResolution2;
@@ -137,14 +135,11 @@ public class ClasspathVariableMarkerResolutionGenerator implements IMarkerResolu
 		 * @see org.eclipse.jdt.internal.junit.ui.JUnitAddLibraryProposal#addToClasspath()
 		 */
 		try {
-			context.run(true, false, new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						project.setRawClasspath(entries, monitor);
-					} catch (JavaModelException e) {
-						throw new InvocationTargetException(e);
-					}
+			context.run(true, false, monitor -> {
+				try {
+					project.setRawClasspath(entries, monitor);
+				} catch (JavaModelException e) {
+					throw new InvocationTargetException(e);
 				}
 			});
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
index 4a22fd62e0..ac506557ac 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
@@ -16,8 +16,6 @@ package org.eclipse.jdt.internal.junit.buildpath;
 import org.eclipse.jdt.junit.JUnitCore;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
@@ -136,12 +134,7 @@ public class JUnitContainerWizardPage extends NewElementWizardPage implements IC
 		} else {
 			fVersionCombo.select(2);
 		}
-		fVersionCombo.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doSelectionChanged();
-			}
-		});
+		fVersionCombo.addModifyListener(e -> doSelectionChanged());
 
 		label= new Label(composite, SWT.NONE);
 		label.setFont(composite.getFont());
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
index 7ad930e99e..a8a04eb0e0 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
@@ -50,12 +50,7 @@ public class JUnitLaunchIncludeExcludeTagsDialog extends StatusDialog {
 
 	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
 
-	IDialogFieldListener fListener= new IDialogFieldListener() {
-		@Override
-		public void dialogFieldChanged(DialogField field) {
-			doDialogFieldChanged(field);
-		}
-	};
+	IDialogFieldListener fListener= field -> doDialogFieldChanged(field);
 
 	public JUnitLaunchIncludeExcludeTagsDialog(Shell parent, ILaunchConfiguration config) {
 		super(parent);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/LaunchErrorStatusHandler.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/LaunchErrorStatusHandler.java
index 184b9701cd..86ed4e3aae 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/LaunchErrorStatusHandler.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/LaunchErrorStatusHandler.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.junit.launcher;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
@@ -30,22 +32,19 @@ public class LaunchErrorStatusHandler implements IStatusHandler {
 
 	@Override
 	public Object handleStatus(final IStatus status, Object source) throws CoreException {
-		final Boolean[] success= new Boolean[] { Boolean.FALSE };
+		final AtomicBoolean success= new AtomicBoolean(false);
 		getDisplay().syncExec(
-				new Runnable() {
-					@Override
-					public void run() {
-						Shell shell= JUnitPlugin.getActiveWorkbenchShell();
-						if (shell == null)
-							shell= getDisplay().getActiveShell();
-						if (shell != null) {
-							MessageDialog.openInformation(shell, JUnitMessages.JUnitLaunchConfigurationDelegate_dialog_title, status.getMessage());
-							success[0]= Boolean.TRUE;
-						}
+				() -> {
+					Shell shell= JUnitPlugin.getActiveWorkbenchShell();
+					if (shell == null)
+						shell= getDisplay().getActiveShell();
+					if (shell != null) {
+						MessageDialog.openInformation(shell, JUnitMessages.JUnitLaunchConfigurationDelegate_dialog_title, status.getMessage());
+						success.set(true);
 					}
 				}
 		);
-		if (success[0] == Boolean.TRUE) {
+		if (success.get()) {
 			return null;
 		}
 		throw new CoreException(status);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java
index 3a96faa6d6..44812c6384 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java
@@ -19,8 +19,6 @@ import java.nio.charset.StandardCharsets;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -267,12 +265,7 @@ public class CompareResultDialog extends TrayDialog {
 	    setCompareViewerInput();
 
 	    Control control= fViewer.getControl();
-	    control.addDisposeListener(new DisposeListener() {
-	        @Override
-			public void widgetDisposed(DisposeEvent e) {
-                compareConfiguration.dispose();
-	        }
-	    });
+	    control.addDisposeListener(e -> compareConfiguration.dispose());
 	    return control;
 	}
 
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java
index de8def7ef9..96f4a17da6 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultsAction.java
@@ -14,9 +14,6 @@
 package org.eclipse.jdt.internal.junit.ui;
 
 
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-
 import org.eclipse.jface.action.Action;
 
 import org.eclipse.jdt.internal.junit.model.TestElement;
@@ -54,12 +51,7 @@ public class CompareResultsAction extends Action {
 		} else {
 			fOpenDialog= new CompareResultDialog(fView.getShell(), failedTest);
 			fOpenDialog.create();
-			fOpenDialog.getShell().addDisposeListener(new DisposeListener() {
-				@Override
-				public void widgetDisposed(DisposeEvent e) {
-					fOpenDialog= null;
-				}
-			});
+			fOpenDialog.getShell().addDisposeListener(e -> fOpenDialog= null);
 			fOpenDialog.setBlockOnOpen(false);
 			fOpenDialog.open();
 		}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java
index 687e5a851e..38f957db30 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CounterPanel.java
@@ -15,8 +15,6 @@ package org.eclipse.jdt.internal.junit.ui;
 
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -54,12 +52,7 @@ public class CounterPanel extends Composite {
 		fNumberOfErrors= createLabel(JUnitMessages.CounterPanel_label_errors, fErrorIcon, " 0 "); //$NON-NLS-1$
 		fNumberOfFailures= createLabel(JUnitMessages.CounterPanel_label_failures, fFailureIcon, " 0 "); //$NON-NLS-1$
 
-		addDisposeListener(new DisposeListener() {
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
+		addDisposeListener(e -> disposeIcons());
 	}
 
 	private void disposeIcons() {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTableDisplay.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTableDisplay.java
index 667d3dfe9d..cd4248ba1d 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTableDisplay.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTableDisplay.java
@@ -17,8 +17,6 @@
 package org.eclipse.jdt.internal.junit.ui;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
@@ -32,12 +30,7 @@ public class FailureTableDisplay implements ITraceDisplay {
 
 	public FailureTableDisplay(Table table) {
 		fTable = table;
-		fTable.getParent().addDisposeListener(new DisposeListener() {
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				disposeIcons();
-			}
-		});
+		fTable.getParent().addDisposeListener(e -> disposeIcons());
 	}
 
 	@Override
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
index 8cd93be331..62fb7af261 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
@@ -18,7 +18,6 @@ package org.eclipse.jdt.internal.junit.ui;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Shell;
@@ -34,7 +33,6 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IOpenEventListener;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.OpenStrategy;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -100,17 +98,14 @@ public class FailureTrace implements IMenuListener {
 		fClipboard= clipboard;
 
 		OpenStrategy handler = new OpenStrategy(fTable);
-		handler.addOpenListener(new IOpenEventListener() {
-			@Override
-			public void handleOpen(SelectionEvent e) {
-				if (fTable.getSelectionIndex() == 0 && fFailure.isComparisonFailure()) {
-					fCompareAction.run();
-				}
-				if (fTable.getSelection().length != 0) {
-					Action a = createOpenEditorAction(getSelectedText());
-					if (a != null)
-						a.run();
-				}
+		handler.addOpenListener(e -> {
+			if (fTable.getSelectionIndex() == 0 && fFailure.isComparisonFailure()) {
+				fCompareAction.run();
+			}
+			if (fTable.getSelection().length != 0) {
+				Action a = createOpenEditorAction(getSelectedText());
+				if (a != null)
+					a.run();
 			}
 		});
 
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
index 830d3d33bc..92680b3c9e 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitAddLibraryProposal.java
@@ -22,11 +22,9 @@ import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -128,14 +126,11 @@ public final class JUnitAddLibraryProposal implements IJavaCompletionProposal {
 		final IClasspathEntry[] newCPEntries= newEntries.toArray(new IClasspathEntry[newEntries.size()]);
 		// fix for 64974 OCE in New JUnit Test Case wizard while workspace is locked [JUnit]
 		try {
-			context.run(true, false, new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						project.setRawClasspath(newCPEntries, monitor);
-					} catch (JavaModelException e) {
-						throw new InvocationTargetException(e);
-					}
+			context.run(true, false, monitor -> {
+				try {
+					project.setRawClasspath(newCPEntries, monitor);
+				} catch (JavaModelException e) {
+					throw new InvocationTargetException(e);
 				}
 			});
 			return true;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
index f78bfcadcf..3d2fe13d37 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
@@ -345,12 +345,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 	}
 
 	public static void asyncShowTestRunnerViewPart() {
-		getDisplay().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				showTestRunnerViewPartInActivePage();
-			}
-		});
+		getDisplay().asyncExec(() -> showTestRunnerViewPartInActivePage());
 	}
 
 	public static TestRunnerViewPart showTestRunnerViewPartInActivePage() {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
index 8c8a33a804..1d9a8c84e3 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
@@ -33,9 +33,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
@@ -49,19 +47,15 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ContentViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.Window;
@@ -432,19 +426,13 @@ public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPre
 		fFilterViewer.setContentProvider(fStackFilterContentProvider);
 		// input just needs to be non-null
 		fFilterViewer.setInput(this);
-		fFilterViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Filter filter= (Filter) event.getElement();
-				fStackFilterContentProvider.toggleFilter(filter);
-			}
+		fFilterViewer.addCheckStateListener(event -> {
+			Filter filter= (Filter) event.getElement();
+			fStackFilterContentProvider.toggleFilter(filter);
 		});
-		fFilterViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection= event.getSelection();
-				fRemoveFilterButton.setEnabled(!selection.isEmpty());
-			}
+		fFilterViewer.addSelectionChangedListener(event -> {
+			ISelection selection= event.getSelection();
+			fRemoveFilterButton.setEnabled(!selection.isEmpty());
 		});
 	}
 
@@ -463,48 +451,28 @@ public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPre
 		gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
 		fAddFilterButton.setLayoutData(gd);
 		LayoutUtil.setButtonDimensionHint(fAddFilterButton);
-		fAddFilterButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				editFilter();
-			}
-		});
+		fAddFilterButton.addListener(SWT.Selection, event -> editFilter());
 
 		fAddTypeButton= new Button(buttonContainer, SWT.PUSH);
 		fAddTypeButton.setText(JUnitMessages.JUnitPreferencePage_addtypebutton_label);
 		gd= getButtonGridData(fAddTypeButton);
 		fAddTypeButton.setLayoutData(gd);
 		LayoutUtil.setButtonDimensionHint(fAddTypeButton);
-		fAddTypeButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				addType();
-			}
-		});
+		fAddTypeButton.addListener(SWT.Selection, event -> addType());
 
 		fAddPackageButton= new Button(buttonContainer, SWT.PUSH);
 		fAddPackageButton.setText(JUnitMessages.JUnitPreferencePage_addpackagebutton_label);
 		gd= getButtonGridData(fAddPackageButton);
 		fAddPackageButton.setLayoutData(gd);
 		SWTUtil.setButtonDimensionHint(fAddPackageButton);
-		fAddPackageButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				addPackage();
-			}
-		});
+		fAddPackageButton.addListener(SWT.Selection, event -> addPackage());
 
 		fRemoveFilterButton= new Button(buttonContainer, SWT.PUSH);
 		fRemoveFilterButton.setText(JUnitMessages.JUnitPreferencePage_removefilterbutton_label);
 		gd= getButtonGridData(fRemoveFilterButton);
 		fRemoveFilterButton.setLayoutData(gd);
 		SWTUtil.setButtonDimensionHint(fRemoveFilterButton);
-		fRemoveFilterButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				removeFilters();
-			}
-		});
+		fRemoveFilterButton.addListener(SWT.Selection, event -> removeFilters());
 		fRemoveFilterButton.setEnabled(false);
 
 		fEnableAllButton= new Button(buttonContainer, SWT.PUSH);
@@ -512,24 +480,14 @@ public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPre
 		gd= getButtonGridData(fEnableAllButton);
 		fEnableAllButton.setLayoutData(gd);
 		SWTUtil.setButtonDimensionHint(fEnableAllButton);
-		fEnableAllButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				checkAllFilters(true);
-			}
-		});
+		fEnableAllButton.addListener(SWT.Selection, event -> checkAllFilters(true));
 
 		fDisableAllButton= new Button(buttonContainer, SWT.PUSH);
 		fDisableAllButton.setText(JUnitMessages.JUnitPreferencePage_disableallbutton_label);
 		gd= getButtonGridData(fDisableAllButton);
 		fDisableAllButton.setLayoutData(gd);
 		SWTUtil.setButtonDimensionHint(fDisableAllButton);
-		fDisableAllButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				checkAllFilters(false);
-			}
-		});
+		fDisableAllButton.addListener(SWT.Selection, event -> checkAllFilters(false));
 
 	}
 
@@ -613,12 +571,7 @@ public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPre
 		// Consume traversal events from the text widget so that CR doesn't
 		// traverse away to dialog's default button.  Without this, hitting
 		// CR in the text field closes the entire dialog.
-		text.addListener(SWT.Traverse, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				event.doit= false;
-			}
-		});
+		text.addListener(SWT.Traverse, event -> event.doit= false);
 	}
 
 	private void validateChangeAndCleanup() {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
index 023c3ed772..dc566ee894 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
@@ -17,10 +17,7 @@ package org.eclipse.jdt.internal.junit.ui;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
@@ -55,19 +52,11 @@ public class JUnitProgressBar extends Canvas {
 				redraw();
 			}
 		});
-		addPaintListener(new PaintListener() {
-			@Override
-			public void paintControl(PaintEvent e) {
-				paint(e);
-			}
-		});
-		addDisposeListener(new DisposeListener() {
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				fFailureColor.dispose();
-				fOKColor.dispose();
-				fStoppedColor.dispose();
-			}
+		addPaintListener(event -> paint(event));
+		addDisposeListener(event -> {
+			fFailureColor.dispose();
+			fOKColor.dispose();
+			fStoppedColor.dispose();
 		});
 		Display display= parent.getDisplay();
 		fFailureColor= new Color(display, 159, 63, 63);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
index 19d77a2773..8aa4974bbb 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
@@ -22,7 +22,6 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 
@@ -31,8 +30,6 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.text.edits.MalformedTreeException;
 import org.eclipse.text.edits.TextEdit;
 
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.contentassist.IContextInformation;
@@ -268,21 +265,18 @@ public class JUnitQuickFixProcessor implements IQuickFixProcessor {
 		@Override
 		public void apply(IDocument document) {
 			try {
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(false, true, new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						try {
-							Change change= createChange();
-							change.initializeValidationData(new NullProgressMonitor());
-							PerformChangeOperation op= new PerformChangeOperation(change);
-							op.setUndoManager(RefactoringCore.getUndoManager(), getDisplayString());
-							op.setSchedulingRule(fJavaProject.getProject().getWorkspace().getRoot());
-							op.run(monitor);
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						} catch (OperationCanceledException e) {
-							throw new InterruptedException();
-						}
+				PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(false, true, monitor -> {
+					try {
+						Change change= createChange();
+						change.initializeValidationData(new NullProgressMonitor());
+						PerformChangeOperation op= new PerformChangeOperation(change);
+						op.setUndoManager(RefactoringCore.getUndoManager(), getDisplayString());
+						op.setSchedulingRule(fJavaProject.getProject().getWorkspace().getRoot());
+						op.run(monitor);
+					} catch (CoreException e1) {
+						throw new InvocationTargetException(e1);
+					} catch (OperationCanceledException e1) {
+						throw new InterruptedException();
 					}
 				});
 			} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java
index 682cf8c7e4..ca46c3d903 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenEditorAction.java
@@ -26,7 +26,6 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
@@ -113,35 +112,32 @@ public abstract class OpenEditorAction extends Action {
 		final IType[] result= { null };
 		final String dottedName= className.replace('$', '.'); // for nested classes...
 		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						if (project != null) {
-							result[0]= internalFindType(project, dottedName, new HashSet<IJavaProject>(), monitor);
-						}
-						if (result[0] == null) {
-							int lastDot= dottedName.lastIndexOf('.');
-							TypeNameMatchRequestor nameMatchRequestor= new TypeNameMatchRequestor() {
-								@Override
-								public void acceptTypeNameMatch(TypeNameMatch match) {
-									result[0]= match.getType();
-								}
-							};
-							new SearchEngine().searchAllTypeNames(
-									lastDot >= 0 ? dottedName.substring(0, lastDot).toCharArray() : null,
-									SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE,
-									(lastDot >= 0 ? dottedName.substring(lastDot + 1) : dottedName).toCharArray(),
-									SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE,
-									IJavaSearchConstants.TYPE,
-									SearchEngine.createWorkspaceScope(),
-									nameMatchRequestor,
-									IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-									monitor);
-						}
-					} catch (JavaModelException e) {
-						throw new InvocationTargetException(e);
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
+				try {
+					if (project != null) {
+						result[0]= internalFindType(project, dottedName, new HashSet<IJavaProject>(), monitor);
 					}
+					if (result[0] == null) {
+						int lastDot= dottedName.lastIndexOf('.');
+						TypeNameMatchRequestor nameMatchRequestor= new TypeNameMatchRequestor() {
+							@Override
+							public void acceptTypeNameMatch(TypeNameMatch match) {
+								result[0]= match.getType();
+							}
+						};
+						new SearchEngine().searchAllTypeNames(
+								lastDot >= 0 ? dottedName.substring(0, lastDot).toCharArray() : null,
+								SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE,
+								(lastDot >= 0 ? dottedName.substring(lastDot + 1) : dottedName).toCharArray(),
+								SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE,
+								IJavaSearchConstants.TYPE,
+								SearchEngine.createWorkspaceScope(),
+								nameMatchRequestor,
+								IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
+								monitor);
+					}
+				} catch (JavaModelException e) {
+					throw new InvocationTargetException(e);
 				}
 			});
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
index a0c4d8ae67..b4b0267a5c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
@@ -23,12 +23,10 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -170,44 +168,41 @@ public class OpenTestAction extends OpenEditorAction {
 
 		List<IMethod> foundMethods= new ArrayList<>();
 		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					String methodPattern= type.getFullyQualifiedName('.') + '.' + fMethodName;
-					if (fMethodParamTypes != null && fMethodParamTypes.length > 0) {
-						String paramTypes= Arrays.stream(fMethodParamTypes).map(paramType -> {
-							try {
-								return paramType= Signature.toString(paramType);
-							} catch (IllegalArgumentException e) {
-								// return the paramType as it is
-							}
-							return paramType.replace('$', '.'); // for nested classes... See OpenEditorAction#findType also.
-						}).collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						methodPattern+= paramTypes;
-					} else {
-						methodPattern+= "()"; //$NON-NLS-1$
-					}
-					int matchRule= SearchPattern.R_ERASURE_MATCH | SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE;
-					SearchPattern searchPattern= SearchPattern.createPattern(methodPattern, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, matchRule);
-					if (searchPattern == null) {
-						return;
-					}
-					SearchRequestor requestor= new SearchRequestor() {
-						@Override
-						public void acceptSearchMatch(SearchMatch match) throws CoreException {
-							Object element= match.getElement();
-							if (element instanceof IMethod) {
-								foundMethods.add((IMethod) element);
-							}
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
+				String methodPattern= type.getFullyQualifiedName('.') + '.' + fMethodName;
+				if (fMethodParamTypes != null && fMethodParamTypes.length > 0) {
+					String paramTypes= Arrays.stream(fMethodParamTypes).map(paramType -> {
+						try {
+							return paramType= Signature.toString(paramType);
+						} catch (IllegalArgumentException e1) {
+							// return the paramType as it is
+						}
+						return paramType.replace('$', '.'); // for nested classes... See OpenEditorAction#findType also.
+					}).collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					methodPattern+= paramTypes;
+				} else {
+					methodPattern+= "()"; //$NON-NLS-1$
+				}
+				int matchRule= SearchPattern.R_ERASURE_MATCH | SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE;
+				SearchPattern searchPattern= SearchPattern.createPattern(methodPattern, IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, matchRule);
+				if (searchPattern == null) {
+					return;
+				}
+				SearchRequestor requestor= new SearchRequestor() {
+					@Override
+					public void acceptSearchMatch(SearchMatch match) throws CoreException {
+						Object element= match.getElement();
+						if (element instanceof IMethod) {
+							foundMethods.add((IMethod) element);
 						}
-					};
-					SearchParticipant[] participants= new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() };
-					IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { type });
-					try {
-						new SearchEngine().search(searchPattern, participants, scope, requestor, monitor);
-					} catch (CoreException e) {
-						JUnitPlugin.log(e);
 					}
+				};
+				SearchParticipant[] participants= new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() };
+				IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { type });
+				try {
+					new SearchEngine().search(searchPattern, participants, scope, requestor, monitor);
+				} catch (CoreException e2) {
+					JUnitPlugin.log(e2);
 				}
 			});
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java
index 53625f17f3..05af5a6fb4 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestMethodSelectionDialog.java
@@ -17,6 +17,7 @@ package org.eclipse.jdt.internal.junit.ui;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.swt.widgets.Shell;
 
@@ -167,20 +168,17 @@ public class TestMethodSelectionDialog extends ElementListSelectionDialog {
 	}
 
 	public Object[] searchTestMethods(final IJavaElement element, final IType testType) throws InvocationTargetException, InterruptedException  {
-		final TestReferenceCollector[] col= new TestReferenceCollector[1];
-
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					col[0]= doSearchTestMethods(element, testType, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		final AtomicReference<TestReferenceCollector> col= new AtomicReference<>();
+
+		IRunnableWithProgress runnable= progressMonitor -> {
+			try {
+				col.set(doSearchTestMethods(element, testType, progressMonitor));
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 		PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);
-		return col[0].getResult();
+		return col.get().getResult();
 	}
 
 	private TestReferenceCollector doSearchTestMethods(IJavaElement element, IType testType, IProgressMonitor pm) throws CoreException{
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
index ec5084f714..3c8414f6f1 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
@@ -98,7 +98,6 @@ import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 
 import org.eclipse.ui.IActionBars;
@@ -676,45 +675,39 @@ public class TestRunnerViewPart extends ViewPart {
 	private class TestRunSessionListener implements ITestRunSessionListener {
 		@Override
 		public void sessionAdded(final TestRunSession testRunSession) {
-			getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (JUnitUIPreferencesConstants.getShowInAllViews() ||
-							getSite().getWorkbenchWindow() == JUnitPlugin.getActiveWorkbenchWindow()) {
-						if (fInfoMessage == null) {
-							String testRunLabel= BasicElementLabels.getJavaElementName(testRunSession.getTestRunName());
-							String msg;
-							if (testRunSession.getLaunch() != null) {
-								msg= Messages.format(JUnitMessages.TestRunnerViewPart_Launching, new Object[]{ testRunLabel });
-							} else {
-								msg= testRunLabel;
-							}
-							registerInfoMessage(msg);
+			getDisplay().asyncExec(() -> {
+				if (JUnitUIPreferencesConstants.getShowInAllViews() ||
+						getSite().getWorkbenchWindow() == JUnitPlugin.getActiveWorkbenchWindow()) {
+					if (fInfoMessage == null) {
+						String testRunLabel= BasicElementLabels.getJavaElementName(testRunSession.getTestRunName());
+						String msg;
+						if (testRunSession.getLaunch() != null) {
+							msg= Messages.format(JUnitMessages.TestRunnerViewPart_Launching, new Object[]{ testRunLabel });
+						} else {
+							msg= testRunLabel;
 						}
-
-						TestRunSession deactivatedSession= setActiveTestRunSession(testRunSession);
-						if (deactivatedSession != null)
-							deactivatedSession.swapOut();
+						registerInfoMessage(msg);
 					}
+
+					TestRunSession deactivatedSession= setActiveTestRunSession(testRunSession);
+					if (deactivatedSession != null)
+						deactivatedSession.swapOut();
 				}
 			});
 		}
 		@Override
 		public void sessionRemoved(final TestRunSession testRunSession) {
-			getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (testRunSession.equals(fTestRunSession)) {
-						List<TestRunSession> testRunSessions= JUnitCorePlugin.getModel().getTestRunSessions();
-						TestRunSession deactivatedSession;
-						if (! testRunSessions.isEmpty()) {
-							deactivatedSession= setActiveTestRunSession(testRunSessions.get(0));
-						} else {
-							deactivatedSession= setActiveTestRunSession(null);
-						}
-						if (deactivatedSession != null)
-							deactivatedSession.swapOut();
+			getDisplay().asyncExec(() -> {
+				if (testRunSession.equals(fTestRunSession)) {
+					List<TestRunSession> testRunSessions= JUnitCorePlugin.getModel().getTestRunSessions();
+					TestRunSession deactivatedSession;
+					if (! testRunSessions.isEmpty()) {
+						deactivatedSession= setActiveTestRunSession(testRunSessions.get(0));
+					} else {
+						deactivatedSession= setActiveTestRunSession(null);
 					}
+					if (deactivatedSession != null)
+						deactivatedSession.swapOut();
 				}
 			});
 		}
@@ -742,23 +735,20 @@ public class TestRunnerViewPart extends ViewPart {
 			String msg= Messages.format(JUnitMessages.TestRunnerViewPart_message_finish, keys);
 			registerInfoMessage(msg);
 
-			postSyncRunnable(new Runnable() {
-				@Override
-				public void run() {
-					if (isDisposed())
-						return;
-					fStopAction.setEnabled(lastLaunchIsKeptAlive());
-					updateRerunFailedFirstAction();
-					processChangesInUI();
-					if (hasErrorsOrFailures()) {
-						selectFirstFailure();
-					}
-					if (fDirtyListener == null) {
-						fDirtyListener= new DirtyListener();
-						JavaCore.addElementChangedListener(fDirtyListener);
-					}
-					warnOfContentChange();
+			postSyncRunnable(() -> {
+				if (isDisposed())
+					return;
+				fStopAction.setEnabled(lastLaunchIsKeptAlive());
+				updateRerunFailedFirstAction();
+				processChangesInUI();
+				if (hasErrorsOrFailures()) {
+					selectFirstFailure();
 				}
+				if (fDirtyListener == null) {
+					fDirtyListener= new DirtyListener();
+					JavaCore.addElementChangedListener(fDirtyListener);
+				}
+				warnOfContentChange();
 			});
 			stopUpdateJobs();
 			showMessageIfNoTests();
@@ -1450,15 +1440,12 @@ public class TestRunnerViewPart extends ViewPart {
 	}
 
 	private void handleStopped() {
-		postSyncRunnable(new Runnable() {
-			@Override
-			public void run() {
-				if (isDisposed())
-					return;
-				resetViewIcon();
-				fStopAction.setEnabled(false);
-				updateRerunFailedFirstAction();
-			}
+		postSyncRunnable(() -> {
+			if (isDisposed())
+				return;
+			resetViewIcon();
+			fStopAction.setEnabled(false);
+			updateRerunFailedFirstAction();
 		});
 		stopUpdateJobs();
 		showMessageIfNoTests();
@@ -1466,12 +1453,9 @@ public class TestRunnerViewPart extends ViewPart {
 
 	private void showMessageIfNoTests() {
 		if (fTestRunSession != null && TestKindRegistry.JUNIT5_TEST_KIND_ID.equals(fTestRunSession.getTestRunnerKind().getId()) && fTestRunSession.getTotalCount() == 0) {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					String msg= Messages.format(JUnitMessages.TestRunnerViewPart_error_notests_kind, fTestRunSession.getTestRunnerKind().getDisplayName());
-					MessageDialog.openInformation(JUnitPlugin.getActiveWorkbenchShell(), JUnitMessages.TestRunnerViewPart__error_cannotrun, msg);
-				}
+			Display.getDefault().asyncExec(() -> {
+				String msg= Messages.format(JUnitMessages.TestRunnerViewPart_error_notests_kind, fTestRunSession.getTestRunnerKind().getDisplayName());
+				MessageDialog.openInformation(JUnitPlugin.getActiveWorkbenchShell(), JUnitMessages.TestRunnerViewPart__error_cannotrun, msg);
 			});
 		}
 	}
@@ -1725,13 +1709,10 @@ action enablement
 	}
 
 	protected void postShowTestResultsView() {
-		postSyncRunnable(new Runnable() {
-			@Override
-			public void run() {
-				if (isDisposed())
-					return;
-				showTestResultsView();
-			}
+		postSyncRunnable(() -> {
+			if (isDisposed())
+				return;
+			showTestResultsView();
 		});
 	}
 
@@ -2045,12 +2026,7 @@ action enablement
 
 		fActivateOnErrorAction= new ActivateOnErrorAction();
 		viewMenu.add(fActivateOnErrorAction);
-		fViewMenuListener= new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				fActivateOnErrorAction.update();
-			}
-		};
+		fViewMenuListener= manager -> fActivateOnErrorAction.update();
 
 		viewMenu.addMenuListener(fViewMenuListener);
 
@@ -2101,12 +2077,9 @@ action enablement
 	}
 
 	private void showFailure(final TestElement test) {
-		postSyncRunnable(new Runnable() {
-			@Override
-			public void run() {
-				if (!isDisposed())
-					fFailureTrace.showFailure(test);
-			}
+		postSyncRunnable(() -> {
+			if (!isDisposed())
+				fFailureTrace.showFailure(test);
 		});
 	}
 
@@ -2148,13 +2121,10 @@ action enablement
 		else if (fViewImage == fTestRunFailIcon)
 			fViewImage= fTestRunFailDirtyIcon;
 
-		Runnable r= new Runnable() {
-			@Override
-			public void run() {
-				if (isDisposed())
-					return;
-				firePropertyChange(IWorkbenchPart.PROP_TITLE);
-			}
+		Runnable r= () -> {
+			if (isDisposed())
+				return;
+			firePropertyChange(IWorkbenchPart.PROP_TITLE);
 		};
 		if (!isDisposed())
 			getDisplay().asyncExec(r);
@@ -2250,12 +2220,7 @@ action enablement
 
 	static void importTestRunSession(final String url) {
 		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					JUnitModel.importTestRunSession(url, monitor);
-				}
-			});
+			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> JUnitModel.importTestRunSession(url, monitor));
 		} catch (InterruptedException e) {
 			// cancelled
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
index 4ce7ac1dc7..4ebe78a73f 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.core.runtime.CoreException;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
@@ -265,12 +264,7 @@ public class TestViewer {
 	private void initContextMenu() {
 		MenuManager menuMgr= new MenuManager("#PopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				handleMenuAboutToShow(manager);
-			}
-		});
+		menuMgr.addMenuListener(manager -> handleMenuAboutToShow(manager));
 		fTestRunnerPart.getSite().registerContextMenu(menuMgr, fSelectionProvider);
 		Menu menu= menuMgr.createContextMenu(fViewerbook);
 		fTreeViewer.getTree().setMenu(menu);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
index 818b595117..4a1d60ff4a 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
@@ -34,9 +34,7 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;
@@ -159,12 +157,7 @@ public class CheckedTableSelectionDialog extends SelectionStatusDialog {
 	@Override
 	public int open() {
 		fIsEmpty= evaluateIfTableEmpty(fInput);
-		BusyIndicator.showWhile(null, new Runnable() {
-			@Override
-			public void run() {
-				access$superOpen();
-			}
-		});
+		BusyIndicator.showWhile(null, () -> access$superOpen());
 		return getReturnCode();
 	}
 
@@ -234,12 +227,7 @@ public class CheckedTableSelectionDialog extends SelectionStatusDialog {
 
 		fViewer.setContentProvider(fContentProvider);
 		fViewer.setLabelProvider(fLabelProvider);
-		fViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateOKStatus();
-			}
-		});
+		fViewer.addCheckStateListener(event -> updateOKStatus());
 
 		if (fFilters != null) {
 			for (ViewerFilter filter : fFilters)
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
index 479aed4690..1833872c6c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
@@ -18,7 +18,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -38,14 +37,11 @@ public class TestSearchEngine extends CoreTestSearchEngine {
 	public static IType[] findTests(IRunnableContext context, final IJavaElement element, final ITestKind testKind) throws InvocationTargetException, InterruptedException {
 		final Set<IType> result= new HashSet<>();
 
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor pm) throws InterruptedException, InvocationTargetException {
-				try {
-					testKind.getFinder().findTestsInContainer(element, result, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		IRunnableWithProgress runnable= progressMonitor -> {
+			try {
+				testKind.getFinder().findTestsInContainer(element, result, progressMonitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 		context.run(true, true, runnable);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java
index ad7813411c..84375c3b47 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/JUnitWizard.java
@@ -86,14 +86,11 @@ public abstract class JUnitWizard extends Wizard implements INewWizard {
 			if (activePage != null) {
 				final Display display= Display.getDefault();
 				if (display != null) {
-					display.asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							try {
-								IDE.openEditor(activePage, (IFile)resource, true);
-							} catch (PartInitException e) {
-								JUnitPlugin.log(e);
-							}
+					display.asyncExec(() -> {
+						try {
+							IDE.openEditor(activePage, (IFile)resource, true);
+						} catch (PartInitException e) {
+							JUnitPlugin.log(e);
 						}
 					});
 				}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java
index 988f2718bd..4bc1d7a91d 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizard.java
@@ -32,7 +32,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubProgressMonitor;
@@ -161,26 +160,22 @@ public class NewTestCaseCreationWizard extends JUnitWizard {
 
 		final ClasspathFixProposal fix= dialog.getSelectedClasspathFix();
 		if (fix != null) {
-			return new IRunnableWithProgress() {
-
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					if (monitor == null) {
-						monitor= new NullProgressMonitor();
-					}
-					monitor.beginTask(WizardMessages.NewTestCaseCreationWizard_create_progress, 4);
-					try {
-						Change change= fix.createChange(new SubProgressMonitor(monitor, 1));
-						new PerformChangeOperation(change).run(new SubProgressMonitor(monitor, 1));
-
-						runnable.run(new SubProgressMonitor(monitor, 2));
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} finally {
-						monitor.done();
-					}
+			return monitor -> {
+				if (monitor == null) {
+					monitor= new NullProgressMonitor();
+				}
+				monitor.beginTask(WizardMessages.NewTestCaseCreationWizard_create_progress, 4);
+				try {
+					Change change= fix.createChange(new SubProgressMonitor(monitor, 1));
+					new PerformChangeOperation(change).run(new SubProgressMonitor(monitor, 1));
+
+					runnable.run(new SubProgressMonitor(monitor, 2));
+				} catch (OperationCanceledException e) {
+					throw new InterruptedException();
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				} finally {
+					monitor.done();
 				}
 			};
 		}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
index ec2c8c1989..92c57f3c38 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
@@ -13,11 +13,8 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.junit.wizards;
 
-import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.jdt.junit.wizards.NewTestSuiteWizardPage;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
 import org.eclipse.core.resources.IResource;
@@ -144,14 +141,11 @@ public class NewTestSuiteCreationWizard extends JUnitWizard {
 	}
 
 	public IRunnableWithProgress getRunnableSave(final IEditorPart cu_ep) {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					if (monitor == null) {
-						monitor= new NullProgressMonitor();
-					}
-					cu_ep.doSave(monitor);
-			}
+		return monitor -> {
+				if (monitor == null) {
+					monitor= new NullProgressMonitor();
+				}
+				cu_ep.doSave(monitor);
 		};
 	}
 }
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
index 39b0d4ef9e..34f5229a61 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
@@ -14,7 +14,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.junit.wizards;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
 import org.eclipse.jdt.junit.wizards.NewTestSuiteWizardPage;
@@ -361,22 +360,19 @@ public class UpdateTestSuite implements IObjectActionDelegate {
 	}
 
 	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				if (monitor == null) {
-					monitor= new NullProgressMonitor();
-				}
-				if (! checkValidateEditStatus(fTestSuite, fShell))
-					return;
-				try {
-					if (fIsJunit4)
-						updateTestCasesInJunit4Suite(monitor, fTestSuite, fSuiteClasses, fSelectedTestCases);
-					else
-						updateTestCasesInSuite(monitor, fTestSuite, fSuiteMethod, fSelectedTestCases);
-				} catch (JavaModelException e) {
-					ExceptionHandler.handle(e, fShell, WizardMessages.UpdateTestSuite_update, WizardMessages.UpdateTestSuite_error);
-				}
+		return monitor -> {
+			if (monitor == null) {
+				monitor= new NullProgressMonitor();
+			}
+			if (! checkValidateEditStatus(fTestSuite, fShell))
+				return;
+			try {
+				if (fIsJunit4)
+					updateTestCasesInJunit4Suite(monitor, fTestSuite, fSuiteClasses, fSelectedTestCases);
+				else
+					updateTestCasesInSuite(monitor, fTestSuite, fSuiteMethod, fSelectedTestCases);
+			} catch (JavaModelException e) {
+				ExceptionHandler.handle(e, fShell, WizardMessages.UpdateTestSuite_update, WizardMessages.UpdateTestSuite_error);
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
index 7a900f1b34..d6151bdd03 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
@@ -23,8 +23,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -52,7 +50,6 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -119,7 +116,6 @@ import org.eclipse.jdt.ui.JavaElementLabelProvider;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
 import org.eclipse.jdt.ui.dialogs.ITypeInfoFilterExtension;
-import org.eclipse.jdt.ui.dialogs.ITypeInfoRequestor;
 import org.eclipse.jdt.ui.dialogs.TypeSelectionExtension;
 
 import org.eclipse.jdt.internal.ui.util.SWTUtil;
@@ -252,13 +248,10 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 			}
 		});
 		fTestLoaderViewer.setInput(items);
-		fTestLoaderViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				setEnableTagsGroup(event);
-				validatePage();
-				updateLaunchConfigurationDialog();
-			}
+		fTestLoaderViewer.addSelectionChangedListener(event -> {
+			setEnableTagsGroup(event);
+			validatePage();
+			updateLaunchConfigurationDialog();
 		});
 	}
 
@@ -305,13 +298,10 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 
 		fProjText= new Text(comp, SWT.SINGLE | SWT.BORDER);
 		fProjText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fProjText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				validatePage();
-				updateLaunchConfigurationDialog();
-				fSearchButton.setEnabled(fTestRadioButton.getSelection() && fProjText.getText().length() > 0);
-			}
+		fProjText.addModifyListener(evt -> {
+			validatePage();
+			updateLaunchConfigurationDialog();
+			fSearchButton.setEnabled(fTestRadioButton.getSelection() && fProjText.getText().length() > 0);
 		});
 
 		fProjButton = new Button(comp, SWT.PUSH);
@@ -333,13 +323,10 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 
 		fTestText = new Text(comp, SWT.SINGLE | SWT.BORDER);
 		fTestText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fTestText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				fTestMethodSearchButton.setEnabled(fTestText.getText().length() > 0);
-				validatePage();
-				updateLaunchConfigurationDialog();
-			}
+		fTestText.addModifyListener(evt -> {
+			fTestMethodSearchButton.setEnabled(fTestText.getText().length() > 0);
+			validatePage();
+			updateLaunchConfigurationDialog();
 		});
 
 		fSearchButton = new Button(comp, SWT.PUSH);
@@ -364,12 +351,9 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 		gd= new GridData(GridData.FILL_HORIZONTAL);
 		fTestMethodText.setLayoutData(gd);
 
-		fTestMethodText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				validatePage();
-				updateLaunchConfigurationDialog();
-			}
+		fTestMethodText.addModifyListener(evt -> {
+			validatePage();
+			updateLaunchConfigurationDialog();
 		});
 		fTestMethodText.setMessage(JUnitMessages.JUnitLaunchConfigurationTab_all_methods_text);
 
@@ -410,12 +394,7 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 		gd.horizontalIndent= 25;
 		gd.horizontalSpan = 2;
 		fContainerText.setLayoutData(gd);
-		fContainerText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
+		fContainerText.addModifyListener(evt -> updateLaunchConfigurationDialog());
 
 		fContainerSearchButton = new Button(comp, SWT.PUSH);
 		fContainerSearchButton.setText(JUnitMessages.JUnitLaunchConfigurationTab_label_search);
@@ -648,17 +627,14 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
 					new TypeSelectionExtension() {
 						@Override
 						public ITypeInfoFilterExtension getFilterExtension() {
-							return new ITypeInfoFilterExtension() {
-								@Override
-								public boolean select(ITypeInfoRequestor requestor) {
-									StringBuilder buf= new StringBuilder();
-									buf.append(requestor.getPackageName()).append('/');
-									String enclosingName= requestor.getEnclosingName();
-									if (enclosingName.length() > 0)
-										buf.append(enclosingName).append('.');
-									buf.append(requestor.getTypeName());
-									return typeLookup.contains(buf.toString());
-								}
+							return requestor -> {
+								StringBuilder buf= new StringBuilder();
+								buf.append(requestor.getPackageName()).append('/');
+								String enclosingName= requestor.getEnclosingName();
+								if (enclosingName.length() > 0)
+									buf.append(enclosingName).append('.');
+								buf.append(requestor.getTypeName());
+								return typeLookup.contains(buf.toString());
 							};
 						}
 					});
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
index 0ea8aae01f..c592e91dae 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
@@ -17,6 +17,7 @@ package org.eclipse.jdt.junit.launcher;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -526,15 +527,10 @@ public class JUnitLaunchShortcut implements ILaunchShortcut2 {
 		if (element != null) {
 			IMember selectedMember = null;
 			if (Display.getCurrent() == null) {
-				final IMember[] temp = new IMember[1];
-				Runnable runnable= new Runnable() {
-					@Override
-					public void run() {
-						temp[0]= resolveSelectedMemberName(editor, element);
-					}
-				};
+				final AtomicReference<IMember> temp = new AtomicReference<>();
+				Runnable runnable= () -> temp.set(resolveSelectedMemberName(editor, element));
 				Display.getDefault().syncExec(runnable);
-				selectedMember = temp[0];
+				selectedMember = temp.get();
 			} else {
 				selectedMember= resolveSelectedMemberName(editor, element);
 			}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
index efaa8ca953..c13275e680 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
@@ -26,8 +26,6 @@ import java.util.Map;
 import com.ibm.icu.text.UTF16;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -519,12 +517,7 @@ public class NewTestCaseWizardPageOne extends NewTypeWizardPage {
 		fClassUnderTestControl.setEnabled(true);
 		fClassUnderTestControl.setFont(composite.getFont());
 		fClassUnderTestControl.setText(fClassUnderTestText);
-		fClassUnderTestControl.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				internalSetClassUnderText(((Text) e.widget).getText());
-			}
-		});
+		fClassUnderTestControl.addModifyListener(modifyEvent -> internalSetClassUnderText(((Text) modifyEvent.widget).getText()));
 		GridData gd= new GridData();
 		gd.horizontalAlignment= GridData.FILL;
 		gd.grabExcessHorizontalSpace= true;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
index 4288add3c5..a65e08274c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageTwo.java
@@ -30,8 +30,6 @@ import org.eclipse.swt.widgets.Widget;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
@@ -170,12 +168,7 @@ public class NewTestCaseWizardPageTwo extends WizardPage {
 
 		fMethodsTree.setLabelProvider(new JavaElementLabelProvider());
 		fMethodsTree.setAutoExpandLevel(2);
-		fMethodsTree.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				doCheckedStateChanged();
-			}
-		});
+		fMethodsTree.addCheckStateListener(event -> doCheckedStateChanged());
 		fMethodsTree.addFilter(new ViewerFilter() {
 			@Override
 			public boolean select(Viewer viewer, Object parentElement, Object element) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
index d0a3a8da64..7bc3d89f2d 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
@@ -34,9 +34,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import org.eclipse.jface.text.BadLocationException;
@@ -298,12 +296,7 @@ public class NewTestSuiteWizardPage extends NewTypeWizardPage {
 			fClassesInSuiteTable.getTable().setLayoutData(gd);
 			fClassesInSuiteTable.setContentProvider(new SuiteClassesContentProvider(isJUnit4()));
 			fClassesInSuiteTable.setLabelProvider(new JavaElementLabelProvider());
-			fClassesInSuiteTable.addCheckStateListener(new ICheckStateListener() {
-				@Override
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					handleFieldChanged(CLASSES_IN_SUITE);
-				}
-			});
+			fClassesInSuiteTable.addCheckStateListener(event -> handleFieldChanged(CLASSES_IN_SUITE));
 
 			Composite buttonContainer= new Composite(parent, SWT.NONE);
 			gd= new GridData(GridData.FILL_VERTICAL);