Bug 564416 - Use lambdas and method references cleanup on JDT UI codeI20200805-1800

For wizards

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

51 files changed, 414 insertions, 722 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerActionGroup.java
index a7a9651322..632a6e6474 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerActionGroup.java
@@ -127,7 +127,7 @@ class PackageExplorerActionGroup extends CompositeActionGroup {
 		fFrameActionsShown= false;
 		TreeViewer viewer= part.getTreeViewer();
 
-		IPropertyChangeListener workingSetListener= event -> doWorkingSetChanged(event);
+		IPropertyChangeListener workingSetListener= this::doWorkingSetChanged;
 
 		IWorkbenchPartSite site = fPart.getSite();
 		setGroups(new ActionGroup[] {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
index f87d415d5b..fb3619c0f5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/WorkingSetAwareContentProvider.java
@@ -50,7 +50,7 @@ public class WorkingSetAwareContentProvider extends PackageExplorerContentProvid
 	public WorkingSetAwareContentProvider(boolean provideMembers, WorkingSetModel model) {
 		super(provideMembers);
 		fWorkingSetModel= model;
-		fListener= event -> workingSetModelChanged(event);
+		fListener= this::workingSetModelChanged;
 		fWorkingSetModel.addPropertyChangeListener(fListener);
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/JavaProjectWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/JavaProjectWizard.java
index e1791408ad..6b006cbcd7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/JavaProjectWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/JavaProjectWizard.java
@@ -93,14 +93,11 @@ public class JavaProjectWizard extends NewElementWizard implements IExecutableEx
 			BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
 			selectAndReveal(fSecondPage.getJavaProject().getProject());
 
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					IWorkbenchPart activePart= getActivePart();
-					if (activePart instanceof IPackagesViewPart) {
-						PackageExplorerPart view= PackageExplorerPart.openInActivePerspective();
-						view.tryToReveal(newElement);
-					}
+			Display.getDefault().asyncExec(() -> {
+				IWorkbenchPart activePart= getActivePart();
+				if (activePart instanceof IPackagesViewPart) {
+					PackageExplorerPart view= PackageExplorerPart.openInActivePerspective();
+					view.tryToReveal(newElement);
 				}
 			});
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewElementWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewElementWizard.java
index cbdc0e11f2..582f9513d5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewElementWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewElementWizard.java
@@ -66,14 +66,11 @@ public abstract class NewElementWizard extends Wizard implements INewWizard {
 		if (activePage != null) {
 			final Display display= getShell().getDisplay();
 			if (display != null) {
-				display.asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						try {
-							IDE.openEditor(activePage, resource, true);
-						} catch (PartInitException e) {
-							JavaPlugin.log(e);
-						}
+				display.asyncExec(() -> {
+					try {
+						IDE.openEditor(activePage, resource, true);
+					} catch (PartInitException e) {
+						JavaPlugin.log(e);
 					}
 				});
 			}
@@ -116,14 +113,11 @@ public abstract class NewElementWizard extends Wizard implements INewWizard {
 	 */
 	@Override
 	public boolean performFinish() {
-		IWorkspaceRunnable op= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
-				try {
-					finishPage(monitor);
-				} catch (InterruptedException e) {
-					throw new OperationCanceledException(e.getMessage());
-				}
+		IWorkspaceRunnable op= monitor -> {
+			try {
+				finishPage(monitor);
+			} catch (InterruptedException e) {
+				throw new OperationCanceledException(e.getMessage());
 			}
 		};
 		try {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewModuleInfoWizard.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewModuleInfoWizard.java
index e506209e94..9700d5c575 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewModuleInfoWizard.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewModuleInfoWizard.java
@@ -136,14 +136,11 @@ public class NewModuleInfoWizard extends Wizard implements INewWizard {
 		if (activePage != null) {
 			final Display display= getDisplay();
 			if (display != null) {
-				display.asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						try {
-							IDE.openEditor(activePage, file, true);
-						} catch (PartInitException e) {
-							JavaPlugin.log(e);
-						}
+				display.asyncExec(() -> {
+					try {
+						IDE.openEditor(activePage, file, true);
+					} catch (PartInitException e) {
+						JavaPlugin.log(e);
 					}
 				});
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
index 9f8a6a4243..dda9eb4ac5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
@@ -109,12 +109,7 @@ public class AddSourceFolderWizardPage extends NewElementWizardPage {
 
 			fVariables= new SelectionButtonDialogField(SWT.PUSH);
 			fVariables.setLabelText(NewWizardMessages.LinkFolderDialog_dependenciesGroup_variables_desc);
-			fVariables.setDialogFieldListener(new IDialogFieldListener() {
-				@Override
-				public void dialogFieldChanged(DialogField field) {
-					handleVariablesButtonPressed();
-				}
-			});
+			fVariables.setDialogFieldListener(field -> handleVariablesButtonPressed());
 		}
 
 		public void setDialogFieldListener(RootFieldAdapter adapter) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
index 7842a50940..9e2361f4e8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathBasePage.java
@@ -26,9 +26,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.core.resources.IWorkspaceRunnable;
 
@@ -126,15 +124,12 @@ public abstract class BuildPathBasePage {
 		IJavaElement[] selectedJavaElements;
 		IJavaProject javaProject= element.getJavaProject();
 		IClasspathEntry newEntry= element.getClasspathEntry();
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IClasspathEntry[] oldClasspath= javaProject.getRawClasspath();
-				int nEntries= oldClasspath.length;
-				IClasspathEntry[] newEntries= Arrays.copyOf(oldClasspath, nEntries+1);
-				newEntries[nEntries]= newEntry;
-				javaProject.setRawClasspath(newEntries, monitor);
-			}
+		IWorkspaceRunnable runnable= monitor -> {
+			IClasspathEntry[] oldClasspath= javaProject.getRawClasspath();
+			int nEntries= oldClasspath.length;
+			IClasspathEntry[] newEntries= Arrays.copyOf(oldClasspath, nEntries+1);
+			newEntries[nEntries]= newEntry;
+			javaProject.setRawClasspath(newEntries, monitor);
 		};
 		PlatformUI.getWorkbench().getProgressService().run(true, true, new WorkbenchRunnableAdapter(runnable));
 		selectedJavaElements= ModuleEncapsulationDetail.getTargetJavaElements(element.getJavaProject(), element.getPath());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
index 2219ae2709..c61d57d3cb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java
@@ -284,13 +284,10 @@ public class BuildPathSupport {
 		}
 
 		final boolean[] result= new boolean[1];
-		shell.getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				String title= NewWizardMessages.BuildPathSupport_putoncpdialog_title;
-				String message= NewWizardMessages.BuildPathSupport_putoncpdialog_message;
-				result[0]= MessageDialog.openQuestion(shell, title, message);
-			}
+		shell.getDisplay().syncExec(() -> {
+			String title= NewWizardMessages.BuildPathSupport_putoncpdialog_title;
+			String message= NewWizardMessages.BuildPathSupport_putoncpdialog_message;
+			result[0]= MessageDialog.openQuestion(shell, title, message);
 		});
 		return result[0];
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
index 878b2b4961..e3da831070 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
@@ -380,14 +380,11 @@ public class BuildPathsBlock {
 		if (Display.getCurrent() != null) {
 			doUpdateUI();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (fSWTWidget == null || fSWTWidget.isDisposed()) {
-						return;
-					}
-					doUpdateUI();
+			Display.getDefault().asyncExec(() -> {
+				if (fSWTWidget == null || fSWTWidget.isDisposed()) {
+					return;
 				}
+				doUpdateUI();
 			});
 		}
 	}
@@ -973,33 +970,27 @@ public class BuildPathsBlock {
 	}
 
 	public static IRemoveOldBinariesQuery getRemoveOldBinariesQuery(final Shell shell) {
-		return new IRemoveOldBinariesQuery() {
-			@Override
-			public boolean doQuery(final boolean removeFolder, final IPath oldOutputLocation) throws OperationCanceledException {
-				final int[] res= new int[] { 1 };
-				Display.getDefault().syncExec(new Runnable() {
-					@Override
-					public void run() {
-						Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-						String title= NewWizardMessages.BuildPathsBlock_RemoveBinariesDialog_title;
-						String message;
-						String pathLabel= BasicElementLabels.getPathLabel(oldOutputLocation, false);
-						if (removeFolder) {
-							message= Messages.format(NewWizardMessages.BuildPathsBlock_RemoveOldOutputFolder_description, pathLabel);
-						} else {
-							message= Messages.format(NewWizardMessages.BuildPathsBlock_RemoveBinariesDialog_description, pathLabel);
-						}
-						MessageDialog dialog= new MessageDialog(sh, title, null, message, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
-						res[0]= dialog.open();
-					}
-				});
-				if (res[0] == 0) {
-					return true;
-				} else if (res[0] == 1) {
-					return false;
+		return (removeFolder, oldOutputLocation) -> {
+			final int[] res= new int[] { 1 };
+			Display.getDefault().syncExec(() -> {
+				Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+				String title= NewWizardMessages.BuildPathsBlock_RemoveBinariesDialog_title;
+				String message;
+				String pathLabel= BasicElementLabels.getPathLabel(oldOutputLocation, false);
+				if (removeFolder) {
+					message= Messages.format(NewWizardMessages.BuildPathsBlock_RemoveOldOutputFolder_description, pathLabel);
+				} else {
+					message= Messages.format(NewWizardMessages.BuildPathsBlock_RemoveBinariesDialog_description, pathLabel);
 				}
-				throw new OperationCanceledException();
+				MessageDialog dialog= new MessageDialog(sh, title, null, message, MessageDialog.QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+				res[0]= dialog.open();
+			});
+			if (res[0] == 0) {
+				return true;
+			} else if (res[0] == 1) {
+				return false;
 			}
+			throw new OperationCanceledException();
 		};
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildpathProblemMarkerResolutionGenerator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildpathProblemMarkerResolutionGenerator.java
index a82422bfe4..395832589c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildpathProblemMarkerResolutionGenerator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildpathProblemMarkerResolutionGenerator.java
@@ -23,14 +23,12 @@ 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.core.runtime.Path;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.ui.IMarkerResolution;
 import org.eclipse.ui.IMarkerResolution2;
@@ -185,14 +183,11 @@ public class BuildpathProblemMarkerResolutionGenerator implements IMarkerResolut
 			if (context == null) {
 				context= PlatformUI.getWorkbench().getProgressService();
 			}
-			context.run(true, true, new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						project.setRawClasspath(newEntries, project.getOutputLocation(), monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
+			context.run(true, true, monitor -> {
+				try {
+					project.setRawClasspath(newEntries, project.getOutputLocation(), monitor);
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			});
 		} catch (JavaModelException e) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
index 0e3044424e..b46fb9b37a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java
@@ -38,8 +38,6 @@ import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
 import org.eclipse.jdt.internal.ui.JavaPluginImages;
 import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
 
@@ -63,12 +61,7 @@ public class ClasspathContainerDefaultPage extends NewElementWizardPage implemen
 
 		fEntryField= new StringDialogField();
 		fEntryField.setLabelText(NewWizardMessages.ClasspathContainerDefaultPage_path_label);
-		fEntryField.setDialogFieldListener(new IDialogFieldListener() {
-			@Override
-			public void dialogFieldChanged(DialogField field) {
-				validatePath();
-			}
-		});
+		fEntryField.setDialogFieldListener(field -> validatePath());
 		validatePath();
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java
index 607b6a07f2..00940e0866 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java
@@ -21,13 +21,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.wizard.WizardPage;
 
@@ -87,18 +83,8 @@ public class ClasspathContainerSelectionPage extends WizardPage {
 		fListViewer.setContentProvider(ArrayContentProvider.getInstance());
 		fListViewer.setComparator(new ViewerComparator());
 		fListViewer.setInput(Arrays.asList(fContainers));
-		fListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				validatePage();
-			}
-		});
-		fListViewer.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				doDoubleClick();
-			}
-		});
+		fListViewer.addSelectionChangedListener(event -> validatePage());
+		fListViewer.addDoubleClickListener(event -> doDoubleClick());
 
 		int selectionIndex= fDialogSettings.getInt(DIALOGSTORE_CONTAINER_IDX);
 		if (selectionIndex >= fContainers.length) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathFixSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathFixSelectionDialog.java
index cb9a21d4e0..542453f1ae 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathFixSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathFixSelectionDialog.java
@@ -30,7 +30,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -40,7 +39,6 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -80,14 +78,11 @@ public class ClasspathFixSelectionDialog extends StatusDialog {
 	public static boolean openClasspathFixSelectionDialog(Shell parent, final IJavaProject project, final String missingType, IRunnableContext context) {
 		final ClasspathFixProposal[][] classPathFixProposals= { null };
 		try {
-			context.run(true, true, new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					MultiStatus status= new MultiStatus(JavaUI.ID_PLUGIN, IStatus.OK, NewWizardMessages.ClasspathFixSelectionDialog_eval_proposals_error_message, null);
-					classPathFixProposals[0]= ClasspathFixProcessorDescriptor.getProposals(project, missingType, status);
-					if (!status.isOK()) {
-						JavaPlugin.log(status);
-					}
+			context.run(true, true, monitor -> {
+				MultiStatus status= new MultiStatus(JavaUI.ID_PLUGIN, IStatus.OK, NewWizardMessages.ClasspathFixSelectionDialog_eval_proposals_error_message, null);
+				classPathFixProposals[0]= ClasspathFixProcessorDescriptor.getProposals(project, missingType, status);
+				if (!status.isOK()) {
+					JavaPlugin.log(status);
 				}
 			});
 		} catch (InvocationTargetException e) {
@@ -98,27 +93,24 @@ public class ClasspathFixSelectionDialog extends StatusDialog {
 		final ClasspathFixSelectionDialog dialog= new ClasspathFixSelectionDialog(parent, project, missingType, classPathFixProposals[0]);
 		if (dialog.open() == Window.OK) {
 			try {
-				context.run(false, true, new IRunnableWithProgress() { // don't fork, because change execution must be in UI thread
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						if (monitor == null) {
-							monitor= new NullProgressMonitor();
-						}
-						monitor.beginTask(NewWizardMessages.ClasspathFixSelectionDialog_process_fix_description, 4);
-						try {
-							ClasspathFixProposal fix= dialog.getSelectedClasspathFix();
-							Change change= fix.createChange(new SubProgressMonitor(monitor, 1));
-
-							PerformChangeOperation op= new PerformChangeOperation(change);
-							op.setUndoManager(RefactoringCore.getUndoManager(), change.getName());
-							op.run(new SubProgressMonitor(monitor, 1));
-						} catch (OperationCanceledException e) {
-							throw new InterruptedException();
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						} finally {
-							monitor.done();
-						}
+				context.run(false, true, monitor -> {
+					if (monitor == null) {
+						monitor= new NullProgressMonitor();
+					}
+					monitor.beginTask(NewWizardMessages.ClasspathFixSelectionDialog_process_fix_description, 4);
+					try {
+						ClasspathFixProposal fix= dialog.getSelectedClasspathFix();
+						Change change= fix.createChange(new SubProgressMonitor(monitor, 1));
+
+						PerformChangeOperation op= new PerformChangeOperation(change);
+						op.setUndoManager(RefactoringCore.getUndoManager(), change.getName());
+						op.run(new SubProgressMonitor(monitor, 1));
+					} catch (OperationCanceledException e1) {
+						throw new InterruptedException();
+					} catch (CoreException e2) {
+						throw new InvocationTargetException(e2);
+					} finally {
+						monitor.done();
 					}
 				});
 				return true;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
index c3b534f00a..fc8cb1325d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CreateMultipleSourceFoldersDialog.java
@@ -37,8 +37,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -170,15 +168,12 @@ public class CreateMultipleSourceFoldersDialog extends TrayDialog {
 						return wizard;
 					}
 				};
-				action.addPropertyChangeListener(new IPropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent event) {
-						if (event.getProperty().equals(IAction.RESULT)) {
-							if (event.getNewValue().equals(Boolean.TRUE)) {
-								result[0]= addFakeFolder(fJavaProject.getProject(), newElement);
-							} else {
-								wizard.cancel();
-							}
+				action.addPropertyChangeListener(event -> {
+					if (event.getProperty().equals(IAction.RESULT)) {
+						if (event.getNewValue().equals(Boolean.TRUE)) {
+							result[0]= addFakeFolder(fJavaProject.getProject(), newElement);
+						} else {
+							wizard.cancel();
 						}
 					}
 				});
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
index 700acbf143..ec5b7316e0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentBlock.java
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
@@ -53,7 +52,6 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
@@ -418,16 +416,13 @@ public class ExternalAnnotationsAttachmentBlock {
 		dialog.setMessage(NewWizardMessages.AnnotationsAttachmentBlock_intjardialog_message);
 		dialog.setInput(fWorkspaceRoot);
 		dialog.setInitialSelection(initSel);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			@Override
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection.length == 1) {
-					Object selectedObject= selection[0];
-					if (selectedObject instanceof IResource && ((IResource) selectedObject).isVirtual())
-						return new StatusInfo(IStatus.ERROR, NewWizardMessages.AnnotationsAttachmentBlock_filename_error_virtual);
-				}
-				return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
+		dialog.setValidator(selection -> {
+			if (selection != null && selection.length == 1) {
+				Object selectedObject= selection[0];
+				if (selectedObject instanceof IResource && ((IResource) selectedObject).isVirtual())
+					return new StatusInfo(IStatus.ERROR, NewWizardMessages.AnnotationsAttachmentBlock_filename_error_virtual);
 			}
+			return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
 		});
 		if (dialog.open() == Window.OK) {
 			IResource res= (IResource) dialog.getFirstResult();
@@ -453,15 +448,12 @@ public class ExternalAnnotationsAttachmentBlock {
 	 * @return return the runnable
 	 */
 	public static IRunnableWithProgress getRunnable(final Shell shell, final IClasspathEntry newEntry, final IJavaProject jproject, final IPath containerPath, final boolean isReferencedEntry) {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					String[] changedAttributes= { IClasspathAttribute.EXTERNAL_ANNOTATION_PATH };
-					BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes, jproject, containerPath, isReferencedEntry, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		return monitor -> {
+			try {
+				String[] changedAttributes= { IClasspathAttribute.EXTERNAL_ANNOTATION_PATH };
+				BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes, jproject, containerPath, isReferencedEntry, monitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentDialog.java
index c6730ad7cd..2a458224d8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExternalAnnotationsAttachmentDialog.java
@@ -19,7 +19,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.jface.dialogs.StatusDialog;
 
@@ -48,12 +47,7 @@ public class ExternalAnnotationsAttachmentDialog extends StatusDialog {
 	public ExternalAnnotationsAttachmentDialog(Shell parent, IPath entry) {
 		super(parent);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 		fAnnotationsAttachmentBlock= new ExternalAnnotationsAttachmentBlock(listener, entry);
 
 		setTitle(NewWizardMessages.ExternalAnnotationsDialog_title);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JavadocLocationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JavadocLocationDialog.java
index b18805a3c5..6fdf3d52d4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JavadocLocationDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JavadocLocationDialog.java
@@ -20,8 +20,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
-
 import org.eclipse.jface.dialogs.StatusDialog;
 
 import org.eclipse.ui.PlatformUI;
@@ -51,12 +49,7 @@ public class JavadocLocationDialog extends StatusDialog {
 	public JavadocLocationDialog(Shell parent, String libraryName, URL initialURL) {
 		super(parent);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 
 		setTitle(Messages.format(NewWizardMessages.LibrariesWorkbookPage_JavadocPropertyDialog_title, libraryName));
 		fJavadocConfigurationBlock= new JavadocConfigurationBlock(parent, listener, initialURL, false);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
index dbb9fa706b..c5b5ec0aa2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
@@ -36,9 +36,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 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.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -159,12 +157,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 		if (Display.getCurrent() != null) {
 			updateLibrariesList();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					updateLibrariesList();
-				}
-			});
+			Display.getDefault().asyncExec(() -> updateLibrariesList());
 		}
 	}
 
@@ -864,12 +857,7 @@ public class LibrariesWorkbookPage extends BuildPathBasePage {
 
 	private void updateContainerEntry(final IClasspathEntry newEntry, final String[] changedAttributes, final IJavaProject jproject, final IPath containerPath) {
 		try {
-			IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-				@Override
-				public void run(IProgressMonitor monitor) throws CoreException {
-					BuildPathSupport.modifyClasspathEntry(null, newEntry, changedAttributes, jproject, containerPath, false, monitor);
-				}
-			};
+			IWorkspaceRunnable runnable= monitor -> BuildPathSupport.modifyClasspathEntry(null, newEntry, changedAttributes, jproject, containerPath, false, monitor);
 			PlatformUI.getWorkbench().getProgressService().run(true, true, new WorkbenchRunnableAdapter(runnable));
 
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsDialog.java
index 3b3f25f02f..caf55ba6a0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddExportsDialog.java
@@ -55,12 +55,7 @@ public class ModuleAddExportsDialog extends StatusDialog {
 	public ModuleAddExportsDialog(Shell parent, IJavaElement[] sourceJavaElements, Collection<String> possibleTargetModules, ModuleAddExpose value) {
 		super(parent);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 		fAddExportsBlock= new ModuleAddExportsBlock(listener, sourceJavaElements, possibleTargetModules, value);
 
 		setTitle(NewWizardMessages.AddExportsDialog_title);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsDialog.java
index 5d38c0e63d..f0cdc80731 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleAddReadsDialog.java
@@ -52,12 +52,7 @@ public class ModuleAddReadsDialog extends StatusDialog {
 	public ModuleAddReadsDialog(Shell parent, IJavaElement[] sourceJavaElements, ModuleAddReads value) {
 		super(parent);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 		fAddReadsBlock= new ModuleAddReadsBlock(listener, sourceJavaElements, value);
 
 		setTitle(NewWizardMessages.AddReadsDialog_title);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
index 33be4dc4cb..0d934d44d7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -267,12 +267,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage {
 		if (Display.getCurrent() != null) {
 			scanModules();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					scanModules();
-				}
-			});
+			Display.getDefault().asyncExec(() -> scanModules());
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/MultipleFolderSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/MultipleFolderSelectionDialog.java
index 1533050ae5..bbe16387e9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/MultipleFolderSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/MultipleFolderSelectionDialog.java
@@ -36,7 +36,6 @@ import org.eclipse.core.resources.IContainer;
 
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -151,23 +150,20 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme
 	@Override
 	public void create() {
 
-		BusyIndicator.showWhile(null, new Runnable() {
-			@Override
-			public void run() {
-				access$superCreate();
+		BusyIndicator.showWhile(null, () -> {
+			access$superCreate();
 
-				fViewer.setCheckedElements(
-					getInitialElementSelections().toArray());
+			fViewer.setCheckedElements(
+				getInitialElementSelections().toArray());
 
-				fViewer.expandToLevel(2);
-				if (fExisting != null) {
-					for (Object object : fExisting) {
-						fViewer.reveal(object);
-					}
+			fViewer.expandToLevel(2);
+			if (fExisting != null) {
+				for (Object object : fExisting) {
+					fViewer.reveal(object);
 				}
-
-				updateOKStatus();
 			}
+
+			updateOKStatus();
 		});
 
 	}
@@ -183,12 +179,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme
 
 		fViewer.setContentProvider(fContentProvider);
 		fViewer.setLabelProvider(fLabelProvider);
-		fViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateOKStatus();
-			}
-		});
+		fViewer.addCheckStateListener(event -> updateOKStatus());
 
 		fViewer.setComparator(new ResourceComparator(ResourceComparator.NAME));
 		if (fFilters != null) {
@@ -251,12 +242,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme
 		if (fFocusElement != null) {
 			treeViewer.setSelection(new StructuredSelection(fFocusElement), true);
 		}
-		treeViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				forceExistingChecked(event);
-			}
-		});
+		treeViewer.addCheckStateListener(event -> forceExistingChecked(event));
 
 		applyDialogFont(composite);
 		return composite;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NativeLibrariesDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NativeLibrariesDialog.java
index e8acd01d7c..ea29f9406b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NativeLibrariesDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NativeLibrariesDialog.java
@@ -19,8 +19,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
-
 import org.eclipse.jface.dialogs.StatusDialog;
 
 import org.eclipse.jdt.core.IClasspathEntry;
@@ -38,12 +36,7 @@ public class NativeLibrariesDialog extends StatusDialog {
 		super(parent);
 		setTitle(NewWizardMessages.NativeLibrariesDialog_title);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 
 		fConfigurationBlock= new NativeLibrariesConfigurationBlock(listener, parent, nativeLibPath, parentEntry);
 		setHelpAvailable(false);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
index ad250b942d..310d54324c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
@@ -111,12 +111,7 @@ public class ProjectsWorkbookPage extends BuildPathBasePage {
 		if (Display.getCurrent() != null) {
 			updateProjectsList();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					updateProjectsList();
-				}
-			});
+			Display.getDefault().asyncExec(() -> updateProjectsList());
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
index fd8ae66be3..d01930455f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentBlock.java
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 
@@ -718,15 +717,12 @@ public class SourceAttachmentBlock {
 	 * @return return the runnable
 	 */
 	public static IRunnableWithProgress getRunnable(final Shell shell, final IClasspathEntry newEntry, final IJavaProject jproject, final IPath containerPath, final boolean isReferencedEntry) {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					String[] changedAttributes= { CPListElement.SOURCEATTACHMENT, CPListElement.SOURCE_ATTACHMENT_ENCODING };
-					BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes, jproject, containerPath, isReferencedEntry, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		return monitor -> {
+			try {
+				String[] changedAttributes= { CPListElement.SOURCEATTACHMENT, CPListElement.SOURCE_ATTACHMENT_ENCODING };
+				BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes, jproject, containerPath, isReferencedEntry, monitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java
index 45dae831d1..46ba44d69b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java
@@ -18,8 +18,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
-
 import org.eclipse.jface.dialogs.StatusDialog;
 
 import org.eclipse.ui.PlatformUI;
@@ -61,12 +59,7 @@ public class SourceAttachmentDialog extends StatusDialog {
 	public SourceAttachmentDialog(Shell parent, IClasspathEntry entry, boolean canEditEncoding) {
 		super(parent);
 
-		IStatusChangeListener listener= new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				updateStatus(status);
-			}
-		};
+		IStatusChangeListener listener= status -> updateStatus(status);
 		fSourceAttachmentBlock= new SourceAttachmentBlock(listener, entry, canEditEncoding);
 
 		setTitle(NewWizardMessages.SourceAttachmentDialog_title);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
index 5ce2c02c90..8b3a7866f6 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
@@ -184,12 +184,7 @@ public class SourceContainerWorkbookPage extends BuildPathBasePage {
 		if (Display.getCurrent() != null) {
 			updateFoldersList();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					updateFoldersList();
-				}
-			});
+			Display.getDefault().asyncExec(() -> updateFoldersList());
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddArchiveToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddArchiveToBuildpathAction.java
index 43a237adbd..5525dbf578 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddArchiveToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddArchiveToBuildpathAction.java
@@ -99,18 +99,15 @@ public class AddArchiveToBuildpathAction extends BuildpathModifierAction {
             	MessageDialog.openWarning(getShell(), NewWizardMessages.AddArchiveToBuildpathAction_InfoTitle, status.getMessage());
             }
 
-        	final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-        		@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-        			try {
-        				List<IJavaElement> result= addExternalJars(selected, javaProject, monitor);
-        				if (result.size() > 0)
-        					selectAndReveal(new StructuredSelection(result));
-        			} catch (CoreException e) {
-        				throw new InvocationTargetException(e);
-        			}
-        		}
-        	};
+        	final IRunnableWithProgress runnable= monitor -> {
+				try {
+					List<IJavaElement> result= addExternalJars(selected, javaProject, monitor);
+					if (result.size() > 0)
+						selectAndReveal(new StructuredSelection(result));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				}
+			};
         	fContext.run(false, false, runnable);
 		} catch (final InvocationTargetException e) {
 			if (e.getCause() instanceof CoreException) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddFolderToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddFolderToBuildpathAction.java
index 8d5780b5a2..6f5c3aa1d8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddFolderToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddFolderToBuildpathAction.java
@@ -172,15 +172,12 @@ public class AddFolderToBuildpathAction extends BuildpathModifierAction {
 			}
 
 			try {
-				final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						try {
-							List<IJavaElement> result= addToClasspath(getSelectedElements(), project, newDefaultOutputLocation.makeAbsolute(), removeProjectFromClasspath, removeOldClassFiles, monitor);
-							selectAndReveal(new StructuredSelection(result));
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						}
+				final IRunnableWithProgress runnable= monitor -> {
+					try {
+						List<IJavaElement> result= addToClasspath(getSelectedElements(), project, newDefaultOutputLocation.makeAbsolute(), removeProjectFromClasspath, removeOldClassFiles, monitor);
+						selectAndReveal(new StructuredSelection(result));
+					} catch (CoreException e) {
+						throw new InvocationTargetException(e);
 					}
 				};
 				fContext.run(false, false, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
index 764082d210..585e78e65d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java
@@ -90,14 +90,11 @@ public class AddLibraryToBuildpathAction extends BuildpathModifierAction {
 			@Override
 			public boolean performFinish() {
 				if (super.performFinish()) {
-					IWorkspaceRunnable op= new IWorkspaceRunnable() {
-						@Override
-						public void run(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
-							try {
-								finishPage(monitor);
-							} catch (InterruptedException e) {
-								throw new OperationCanceledException(e.getMessage());
-							}
+					IWorkspaceRunnable op= monitor -> {
+						try {
+							finishPage(monitor);
+						} catch (InterruptedException e) {
+							throw new OperationCanceledException(e.getMessage());
 						}
 					};
 					try {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
index 88ed5ed082..5017ad6669 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddSelectedLibraryToBuildpathAction.java
@@ -103,16 +103,13 @@ public class AddSelectedLibraryToBuildpathAction extends BuildpathModifierAction
 		try {
 			final IFile[] files= getSelectedElements().toArray(new IFile[getSelectedElements().size()]);
 
-			final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-				        IJavaProject project= JavaCore.create(files[0].getProject());
-				        List<IJavaElement> result= addLibraryEntries(files, project, monitor);
-						selectAndReveal(new StructuredSelection(result));
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
+			final IRunnableWithProgress runnable= monitor -> {
+				try {
+			        IJavaProject project= JavaCore.create(files[0].getProject());
+			        List<IJavaElement> result= addLibraryEntries(files, project, monitor);
+					selectAndReveal(new StructuredSelection(result));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			fContext.run(false, false, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
index 8098be95c6..7fc6973ec7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/BuildpathModifierAction.java
@@ -188,12 +188,7 @@ public abstract class BuildpathModifierAction extends Action implements ISelecti
 			if (target != null) {
 				// select and reveal resource
 				final ISetSelectionTarget finalTarget= target;
-				page.getWorkbenchWindow().getShell().getDisplay().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						finalTarget.selectReveal(selection);
-					}
-				});
+				page.getWorkbenchWindow().getShell().getDisplay().asyncExec(() -> finalTarget.selectReveal(selection));
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierQueries.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierQueries.java
index a9474818f7..2a7f1a9426 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierQueries.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ClasspathModifierQueries.java
@@ -376,37 +376,34 @@ public class ClasspathModifierQueries {
                 final boolean[] result= { false };
                 fRemoveProject= false;
                 fOutputLocation= project.getOutputLocation();
-				Display.getDefault().syncExec(new Runnable() {
-					@Override
-					public void run() {
-						Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-
-						String title= NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_title;
-
-						if (fDesiredOutputLocation.segmentCount() == 1) {
-							String outputFolderName= PreferenceConstants.getPreferenceStore().getString(PreferenceConstants.SRCBIN_BINNAME);
-							IPath newOutputFolder= fDesiredOutputLocation.append(outputFolderName);
-							newOutputFolder= getValidPath(newOutputFolder, validator);
-							String message= Messages.format(NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_project_outputLocation, BasicElementLabels.getPathLabel(newOutputFolder, false));
-							fRemoveProject= true;
-							if (MessageDialog.openConfirm(sh, title, message)) {
-								fOutputLocation= newOutputFolder;
-								result[0]= true;
-							}
-						} else {
-							IPath newOutputFolder= fDesiredOutputLocation;
-							newOutputFolder= getValidPath(newOutputFolder, validator);
-							if (editingOutputFolder) {
-								fOutputLocation= newOutputFolder;
-								result[0]= true;
-								return; // show no dialog
-							}
-							String message= NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_project_message;
-							fRemoveProject= true;
-							if (MessageDialog.openQuestion(sh, title, message)) {
-								fOutputLocation= newOutputFolder;
-								result[0]= true;
-							}
+				Display.getDefault().syncExec(() -> {
+					Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+
+					String title= NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_title;
+
+					if (fDesiredOutputLocation.segmentCount() == 1) {
+						String outputFolderName= PreferenceConstants.getPreferenceStore().getString(PreferenceConstants.SRCBIN_BINNAME);
+						IPath newOutputFolder1= fDesiredOutputLocation.append(outputFolderName);
+						newOutputFolder1= getValidPath(newOutputFolder1, validator);
+						String message1= Messages.format(NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_project_outputLocation, BasicElementLabels.getPathLabel(newOutputFolder1, false));
+						fRemoveProject= true;
+						if (MessageDialog.openConfirm(sh, title, message1)) {
+							fOutputLocation= newOutputFolder1;
+							result[0]= true;
+						}
+					} else {
+						IPath newOutputFolder2= fDesiredOutputLocation;
+						newOutputFolder2= getValidPath(newOutputFolder2, validator);
+						if (editingOutputFolder) {
+							fOutputLocation= newOutputFolder2;
+							result[0]= true;
+							return; // show no dialog
+						}
+						String message2= NewWizardMessages.ClasspathModifier_ChangeOutputLocationDialog_project_message;
+						fRemoveProject= true;
+						if (MessageDialog.openQuestion(sh, title, message2)) {
+							fOutputLocation= newOutputFolder2;
+							result[0]= true;
 						}
 					}
 				});
@@ -454,15 +451,12 @@ public class ClasspathModifierQueries {
 			@Override
 			public boolean doQuery(final CPListElement element, final boolean focusOnExcluded) {
 				final boolean[] result= { false };
-				Display.getDefault().syncExec(new Runnable() {
-					@Override
-					public void run() {
-						Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-						ExclusionInclusionDialog dialog= new ExclusionInclusionDialog(sh, element, focusOnExcluded);
-						result[0]= dialog.open() == Window.OK;
-						fInclusionPattern= dialog.getInclusionPattern();
-						fExclusionPattern= dialog.getExclusionPattern();
-					}
+				Display.getDefault().syncExec(() -> {
+					Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+					ExclusionInclusionDialog dialog= new ExclusionInclusionDialog(sh, element, focusOnExcluded);
+					result[0]= dialog.open() == Window.OK;
+					fInclusionPattern= dialog.getInclusionPattern();
+					fExclusionPattern= dialog.getExclusionPattern();
 				});
 				return result[0];
 			}
@@ -490,23 +484,16 @@ public class ClasspathModifierQueries {
      * @see IAddArchivesQuery
      */
     public static IAddArchivesQuery getDefaultArchivesQuery(final Shell shell) {
-        return new IAddArchivesQuery() {
-
-            @Override
-			public IPath[] doQuery() {
-                final IPath[][] selected= {null};
-                Display.getDefault().syncExec(new Runnable() {
-                    @Override
-					public void run() {
-                        Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-                        selected[0]= BuildPathDialogAccess.chooseExternalJAREntries(sh);
-                    }
-                });
-                if(selected[0] == null)
-                    return new IPath[0];
-                return selected[0];
-            }
-        };
+        return () -> {
+		    final IPath[][] selected= {null};
+		    Display.getDefault().syncExec(() -> {
+			    Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+			    selected[0]= BuildPathDialogAccess.chooseExternalJAREntries(sh);
+			});
+		    if(selected[0] == null)
+		        return new IPath[0];
+		    return selected[0];
+		};
     }
 
     /**
@@ -518,25 +505,17 @@ public class ClasspathModifierQueries {
 	 * @see IRemoveLinkedFolderQuery
 	 */
 	public static IRemoveLinkedFolderQuery getDefaultRemoveLinkedFolderQuery(final Shell shell) {
-		return new IRemoveLinkedFolderQuery() {
-
-			@Override
-			public final int doQuery(final IFolder folder) {
-				final int[] result= { IRemoveLinkedFolderQuery.REMOVE_BUILD_PATH};
-				Display.getDefault().syncExec(new Runnable() {
-
-					@Override
-					public final void run() {
-						final RemoveLinkedFolderDialog dialog= new RemoveLinkedFolderDialog((shell != null ? shell : JavaPlugin.getActiveWorkbenchShell()), folder);
-						final int status= dialog.open();
-						if (status == 0)
-							result[0]= dialog.getRemoveStatus();
-						else
-							result[0]= IRemoveLinkedFolderQuery.REMOVE_CANCEL;
-					}
-				});
-				return result[0];
-			}
+		return folder -> {
+			final int[] result= { IRemoveLinkedFolderQuery.REMOVE_BUILD_PATH};
+			Display.getDefault().syncExec(() -> {
+				final RemoveLinkedFolderDialog dialog= new RemoveLinkedFolderDialog((shell != null ? shell : JavaPlugin.getActiveWorkbenchShell()), folder);
+				final int status= dialog.open();
+				if (status == 0)
+					result[0]= dialog.getRemoveStatus();
+				else
+					result[0]= IRemoveLinkedFolderQuery.REMOVE_CANCEL;
+			});
+			return result[0];
 		};
 	}
 
@@ -551,23 +530,16 @@ public class ClasspathModifierQueries {
      * been cancelled by the user.
      */
     public static IAddLibrariesQuery getDefaultLibrariesQuery(final Shell shell) {
-        return new IAddLibrariesQuery() {
-
-            @Override
-			public IClasspathEntry[] doQuery(final IJavaProject project, final IClasspathEntry[] entries) {
-                final IClasspathEntry[][] selected= {null};
-                Display.getDefault().syncExec(new Runnable() {
-                    @Override
-					public void run() {
-                        Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-                        selected[0]= BuildPathDialogAccess.chooseContainerEntries(sh, project, entries);
-                    }
-                });
-                if(selected[0] == null)
-                    return new IClasspathEntry[0];
-                return selected[0];
-            }
-        };
+        return (project, entries) -> {
+		    final IClasspathEntry[][] selected= {null};
+		    Display.getDefault().syncExec(() -> {
+			    Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+			    selected[0]= BuildPathDialogAccess.chooseContainerEntries(sh, project, entries);
+			});
+		    if(selected[0] == null)
+		        return new IClasspathEntry[0];
+		    return selected[0];
+		};
     }
 
     /**
@@ -585,23 +557,20 @@ public class ClasspathModifierQueries {
 			@Override
 			public boolean doQuery() {
 				final boolean[] isOK= {false};
-                Display.getDefault().syncExec(new Runnable() {
-                    @Override
-					public void run() {
-                        Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
-
-                        NewFolderDialog dialog= new NewFolderDialog(sh, project.getProject());
-                        isOK[0]= dialog.open() == Window.OK;
-                        if (isOK[0]) {
-                        	IResource sourceContainer= (IResource) dialog.getResult()[0];
-                        	if (sourceContainer instanceof IFolder) {
-                        		fNewFolder= (IFolder)sourceContainer;
-                        	} else {
-                        		fNewFolder= null;
-                        	}
-                        }
-                    }
-                });
+                Display.getDefault().syncExec(() -> {
+				    Shell sh= shell != null ? shell : JavaPlugin.getActiveWorkbenchShell();
+
+				    NewFolderDialog dialog= new NewFolderDialog(sh, project.getProject());
+				    isOK[0]= dialog.open() == Window.OK;
+				    if (isOK[0]) {
+				    	IResource sourceContainer= (IResource) dialog.getResult()[0];
+				    	if (sourceContainer instanceof IFolder) {
+				    		fNewFolder= (IFolder)sourceContainer;
+				    	} else {
+				    		fNewFolder= null;
+				    	}
+				    }
+				});
                 return isOK[0];
 			}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
index 9736bd51dd..76fbdacd45 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
@@ -18,8 +18,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -28,7 +26,6 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
 import org.eclipse.core.resources.IFile;
@@ -41,8 +38,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IPostSelectionProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -347,34 +342,26 @@ public class DialogPackageExplorer implements IMenuListener, IPostSelectionProvi
         fPackageViewer.setComparer(WorkingSetModel.COMPARER);
         fPackageViewer.addFilter(new PackageFilter());
         fPackageViewer.setComparator(new ExtendedJavaElementSorter());
-        fPackageViewer.addDoubleClickListener(new IDoubleClickListener() {
-            @Override
-			public void doubleClick(DoubleClickEvent event) {
-                Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
-                if (fPackageViewer.isExpandable(element)) {
-                    fPackageViewer.setExpandedState(element, !fPackageViewer.getExpandedState(element));
-                } else {
-                	if (element instanceof CPListElementAttribute) {
-						CPListElementAttribute attribute= (CPListElementAttribute)element;
-                		if (attribute.getKey().equals(CPListElement.OUTPUT)) {
-                			fActionGroup.getEditOutputFolderAction().run();
-                		}
-                	}
-                }
-            }
-        });
+        fPackageViewer.addDoubleClickListener(event -> {
+		    Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
+		    if (fPackageViewer.isExpandable(element)) {
+		        fPackageViewer.setExpandedState(element, !fPackageViewer.getExpandedState(element));
+		    } else {
+		    	if (element instanceof CPListElementAttribute) {
+					CPListElementAttribute attribute= (CPListElementAttribute)element;
+		    		if (attribute.getKey().equals(CPListElement.OUTPUT)) {
+		    			fActionGroup.getEditOutputFolderAction().run();
+		    		}
+		    	}
+		    }
+		});
 
         MenuManager menuMgr= new MenuManager("#PopupMenu"); //$NON-NLS-1$
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(this);
         fContextMenu= menuMgr.createContextMenu(fPackageViewer.getTree());
         fPackageViewer.getTree().setMenu(fContextMenu);
-        parent.addDisposeListener(new DisposeListener() {
-            @Override
-			public void widgetDisposed(DisposeEvent e) {
-                fContextMenu.dispose();
-            }
-        });
+        parent.addDisposeListener(e -> fContextMenu.dispose());
 
         return fPackageViewer.getControl();
     }
@@ -461,18 +448,15 @@ public class DialogPackageExplorer implements IMenuListener, IPostSelectionProvi
         if (elements == null || elements.isEmpty())
             return;
 		try {
-	        ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
-	        	@Override
-				public void run(IProgressMonitor monitor) throws CoreException {
-	        		fPackageViewer.refresh();
-	                IStructuredSelection selection= new StructuredSelection(elements);
-	                fPackageViewer.setSelection(selection, true);
-	                fPackageViewer.getTree().setFocus();
-
-	                if (elements.size() == 1 && elements.get(0) instanceof IJavaProject)
-	                    fPackageViewer.expandToLevel(elements.get(0), 1);
-	            }
-	        }, ResourcesPlugin.getWorkspace().getRoot(), IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+	        ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) monitor -> {
+				fPackageViewer.refresh();
+			    IStructuredSelection selection= new StructuredSelection(elements);
+			    fPackageViewer.setSelection(selection, true);
+			    fPackageViewer.getTree().setFocus();
+
+			    if (elements.size() == 1 && elements.get(0) instanceof IJavaProject)
+			        fPackageViewer.expandToLevel(elements.get(0), 1);
+			}, ResourcesPlugin.getWorkspace().getRoot(), IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
         } catch (CoreException e) {
 	        JavaPlugin.log(e);
         }
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
index e3c404130d..810ce7eb69 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/EditOutputFolderAction.java
@@ -21,7 +21,6 @@ import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.core.resources.IFolder;
@@ -149,24 +148,21 @@ public class EditOutputFolderAction extends BuildpathModifierAction {
         	}
 
 			try {
-				final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						try {
-                        	monitor.beginTask(NewWizardMessages.EditOutputFolderAction_ProgressMonitorDescription, 50 + (folderToDelete == null?0:10));
-
-                        	ClasspathModifier.commitClassPath(cpProject, new SubProgressMonitor(monitor, 50));
-                        	if (folderToDelete != null)
-                                folderToDelete.delete(true, new SubProgressMonitor(monitor, 10));
-
-                        	informListeners(delta);
-                        	selectAndReveal(new StructuredSelection(JavaCore.create(element.getResource())));
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						} finally {
-                        	monitor.done();
-                        }
-					}
+				final IRunnableWithProgress runnable= monitor -> {
+					try {
+				    	monitor.beginTask(NewWizardMessages.EditOutputFolderAction_ProgressMonitorDescription, 50 + (folderToDelete == null?0:10));
+
+				    	ClasspathModifier.commitClassPath(cpProject, new SubProgressMonitor(monitor, 50));
+				    	if (folderToDelete != null)
+				            folderToDelete.delete(true, new SubProgressMonitor(monitor, 10));
+
+				    	informListeners(delta);
+				    	selectAndReveal(new StructuredSelection(JavaCore.create(element.getResource())));
+					} catch (CoreException e) {
+						throw new InvocationTargetException(e);
+					} finally {
+				    	monitor.done();
+				    }
 				};
 				fContext.run(false, false, runnable);
 			} catch (final InvocationTargetException e) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ExcludeFromBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ExcludeFromBuildpathAction.java
index be3ee6623b..5d6b595186 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ExcludeFromBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ExcludeFromBuildpathAction.java
@@ -106,15 +106,12 @@ public class ExcludeFromBuildpathAction extends BuildpathModifierAction {
         }
 
         try {
-			final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-				        List<IResource> result= exclude(getSelectedElements(), project, monitor);
-				        selectAndReveal(new StructuredSelection(result));
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
+			final IRunnableWithProgress runnable= monitor -> {
+				try {
+			        List<IResource> result= exclude(getSelectedElements(), project, monitor);
+			        selectAndReveal(new StructuredSelection(result));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			fContext.run(false, false, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/GenerateBuildPathActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/GenerateBuildPathActionGroup.java
index f8744b272a..a7734e45cd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/GenerateBuildPathActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/GenerateBuildPathActionGroup.java
@@ -18,7 +18,6 @@ import java.util.List;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
@@ -225,12 +224,7 @@ public class GenerateBuildPathActionGroup extends ActionGroup {
         	return;
         String menuText= ActionMessages.BuildPath_label;
         IMenuManager subMenu= new MenuManager(menuText, MENU_ID);
-        subMenu.addMenuListener(new IMenuListener() {
-        	@Override
-			public void menuAboutToShow(IMenuManager manager) {
-        		fillViewSubMenu(manager);
-        	}
-        });
+        subMenu.addMenuListener(manager -> fillViewSubMenu(manager));
         subMenu.setRemoveAllWhenShown(true);
         subMenu.add(new ConfigureBuildPathAction(fSite));
         menu.appendToGroup(fGroupName, subMenu);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/HintTextGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/HintTextGroup.java
index c9b9bf5b40..0885547011 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/HintTextGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/HintTextGroup.java
@@ -21,8 +21,6 @@ import java.util.Iterator;
 import java.util.List;
 
 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;
@@ -89,17 +87,14 @@ public final class HintTextGroup implements ISelectionChangedListener {
         fTopComposite.setLayout(gridLayout);
         fTopComposite.setLayoutData(gridData);
         fTopComposite.setData(null);
-        fTopComposite.addDisposeListener(new DisposeListener() {
-            @Override
-			public void widgetDisposed(DisposeEvent e) {
-                Collection<Image> collection= fImageMap.values();
-                Iterator<Image> iterator= collection.iterator();
-                while(iterator.hasNext()) {
-                    Image image= iterator.next();
-                    image.dispose();
-                }
-            }
-        });
+        fTopComposite.addDisposeListener(e -> {
+		    Collection<Image> collection= fImageMap.values();
+		    Iterator<Image> iterator= collection.iterator();
+		    while(iterator.hasNext()) {
+		        Image image= iterator.next();
+		        image.dispose();
+		    }
+		});
         return fTopComposite;
     }
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
index 70cfe8db0d..4fb7565027 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/IncludeToBuildpathAction.java
@@ -100,15 +100,12 @@ public class IncludeToBuildpathAction extends BuildpathModifierAction {
 		final IJavaProject project= JavaCore.create(resource.getProject());
 
 		try {
-			final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						List<?> result= unExclude(getSelectedElements(), project, monitor);
-						selectAndReveal(new StructuredSelection(result));
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
+			final IRunnableWithProgress runnable= monitor -> {
+				try {
+					List<?> result= unExclude(getSelectedElements(), project, monitor);
+					selectAndReveal(new StructuredSelection(result));
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			fContext.run(false, false, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java
index 1917b37d3a..fc365f538a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java
@@ -62,7 +62,6 @@ import org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathsBlock;
 import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElement;
 import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElementAttribute;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
@@ -140,12 +139,7 @@ public class NewSourceContainerWorkbookPage extends BuildPathBasePage implements
 		if (Display.getCurrent() != null) {
 			doUpdateUI();
 		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					doUpdateUI();
-				}
-			});
+			Display.getDefault().asyncExec(() -> doUpdateUI());
 		}
     }
 
@@ -243,36 +237,28 @@ public class NewSourceContainerWorkbookPage extends BuildPathBasePage implements
 
 		fCreateModuleInfoFileButton.doFillIntoGrid(body, 1);
 
-		fCreateModuleInfoFileButton.setDialogFieldListener(new IDialogFieldListener() {
-			@Override
-			public void dialogFieldChanged(DialogField field) {
-				fCreateModuleInfoFile= fCreateModuleInfoFileButton.isSelected();
-			}
-		});
+		fCreateModuleInfoFileButton.setDialogFieldListener(field -> fCreateModuleInfoFile= fCreateModuleInfoFileButton.isSelected());
 
 
         fActionGroup= new DialogPackageExplorerActionGroup(fHintTextGroup, fContext, fPackageExplorer, this);
 		fActionGroup.addBuildpathModifierListener(this);
 
 
-        fUseFolderOutputs.setDialogFieldListener(new IDialogFieldListener() {
-            @Override
-			public void dialogFieldChanged(DialogField field) {
-                boolean isUseFolders= fUseFolderOutputs.isSelected();
-                if (!isUseFolders) {
-                	ResetAllOutputFoldersAction action= new ResetAllOutputFoldersAction(fContext, fJavaProject, fPackageExplorer) {
-                		@Override
-						public void run() {
-                    		commitDefaultOutputFolder();
-                    	    super.run();
-                    	}
-                	};
-                	action.addBuildpathModifierListener(NewSourceContainerWorkbookPage.this);
-                	action.run();
-                }
-				fPackageExplorer.showOutputFolders(isUseFolders);
-            }
-        });
+        fUseFolderOutputs.setDialogFieldListener(field -> {
+		    boolean isUseFolders= fUseFolderOutputs.isSelected();
+		    if (!isUseFolders) {
+		    	ResetAllOutputFoldersAction action= new ResetAllOutputFoldersAction(fContext, fJavaProject, fPackageExplorer) {
+		    		@Override
+					public void run() {
+		        		commitDefaultOutputFolder();
+		        	    super.run();
+		        	}
+		    	};
+		    	action.addBuildpathModifierListener(NewSourceContainerWorkbookPage.this);
+		    	action.run();
+		    }
+			fPackageExplorer.showOutputFolders(isUseFolders);
+		});
 
         Composite outputLocation= new Composite(body, SWT.NONE);
         outputLocation.setLayout(new GridLayout(2, false));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
index 0625d14212..1a92ee050f 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/RemoveFromBuildpathAction.java
@@ -128,45 +128,42 @@ public class RemoveFromBuildpathAction extends BuildpathModifierAction {
 			final List<IFolder> foldersToDelete= new ArrayList<>();
 			queryToRemoveLinkedFolders(elementsToRemove, foldersToDelete);
 
-			final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						monitor.beginTask(NewWizardMessages.ClasspathModifier_Monitor_RemoveFromBuildpath, foldersToDelete.size() + 10);
-
-						CPJavaProject cpProject= CPJavaProject.createFromExisting(project);
-						CPListElement[] toRemove= new CPListElement[elementsToRemove.size()];
-						int i= 0;
-						for (Object element : elementsToRemove) {
-							if (element instanceof IJavaProject) {
-								toRemove[i]= ClasspathModifier.getListElement(((IJavaProject)element).getPath(), cpProject.getCPListElements());
-							} else if (element instanceof IPackageFragmentRoot) {
-								toRemove[i]= CPListElement.createFromExisting(((IPackageFragmentRoot)element).getRawClasspathEntry(), project);
-							} else {
-								toRemove[i]= CPListElement.createFromExisting(((ClassPathContainer)element).getClasspathEntry(), project);
-							}
-							i++;
+			final IRunnableWithProgress runnable= monitor -> {
+				try {
+					monitor.beginTask(NewWizardMessages.ClasspathModifier_Monitor_RemoveFromBuildpath, foldersToDelete.size() + 10);
+
+					CPJavaProject cpProject= CPJavaProject.createFromExisting(project);
+					CPListElement[] toRemove= new CPListElement[elementsToRemove.size()];
+					int i= 0;
+					for (Object element : elementsToRemove) {
+						if (element instanceof IJavaProject) {
+							toRemove[i]= ClasspathModifier.getListElement(((IJavaProject)element).getPath(), cpProject.getCPListElements());
+						} else if (element instanceof IPackageFragmentRoot) {
+							toRemove[i]= CPListElement.createFromExisting(((IPackageFragmentRoot)element).getRawClasspathEntry(), project);
+						} else {
+							toRemove[i]= CPListElement.createFromExisting(((ClassPathContainer)element).getClasspathEntry(), project);
 						}
+						i++;
+					}
 
-						BuildpathDelta delta= ClasspathModifier.removeFromBuildpath(toRemove, cpProject);
-						ClasspathModifier.commitClassPath(cpProject, new SubProgressMonitor(monitor, 10));
+					BuildpathDelta delta= ClasspathModifier.removeFromBuildpath(toRemove, cpProject);
+					ClasspathModifier.commitClassPath(cpProject, new SubProgressMonitor(monitor, 10));
 
-						deleteFolders(foldersToDelete, new SubProgressMonitor(monitor, foldersToDelete.size()));
+					deleteFolders(foldersToDelete, new SubProgressMonitor(monitor, foldersToDelete.size()));
 
-						informListeners(delta);
+					informListeners(delta);
 
-						if (delta.getDeletedResources().length == foldersToDelete.size()) {
-							selectAndReveal(new StructuredSelection(project));
-						} else {
-							List<IResource> result= new ArrayList<>(Arrays.asList(delta.getDeletedResources()));
-							result.removeAll(foldersToDelete);
-							selectAndReveal(new StructuredSelection(result));
-						}
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} finally {
-						monitor.done();
+					if (delta.getDeletedResources().length == foldersToDelete.size()) {
+						selectAndReveal(new StructuredSelection(project));
+					} else {
+						List<IResource> result= new ArrayList<>(Arrays.asList(delta.getDeletedResources()));
+						result.removeAll(foldersToDelete);
+						selectAndReveal(new StructuredSelection(result));
 					}
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
+				} finally {
+					monitor.done();
 				}
 			};
 			fContext.run(false, false, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAction.java
index cacde3d5d6..e810fdc81a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAction.java
@@ -95,25 +95,22 @@ public class ResetAction extends BuildpathModifierAction {
 
 	@Override
 	public void run() {
-		final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					Object firstElement= getSelectedElements().get(0);
-					IJavaProject project= null;
-					if (firstElement instanceof IJavaProject) {
-						project= (IJavaProject)firstElement;
-					} else if (firstElement instanceof IPackageFragmentRoot) {
-						project= ((IPackageFragmentRoot)firstElement).getJavaProject();
-					} else {
-						project= ((CPListElementAttribute)firstElement).getParent().getJavaProject();
-					}
-
-					List<Object> result= reset(getSelectedElements(), project, monitor);
-					selectAndReveal(new StructuredSelection(result));
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
+		final IRunnableWithProgress runnable= monitor -> {
+			try {
+				Object firstElement= getSelectedElements().get(0);
+				IJavaProject project= null;
+				if (firstElement instanceof IJavaProject) {
+					project= (IJavaProject)firstElement;
+				} else if (firstElement instanceof IPackageFragmentRoot) {
+					project= ((IPackageFragmentRoot)firstElement).getJavaProject();
+				} else {
+					project= ((CPListElementAttribute)firstElement).getParent().getJavaProject();
 				}
+
+				List<Object> result= reset(getSelectedElements(), project, monitor);
+				selectAndReveal(new StructuredSelection(result));
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 		try {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
index 7fe9f76e7f..d08f589671 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
@@ -18,7 +18,6 @@ import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.core.resources.IResource;
 
@@ -109,40 +108,37 @@ public class ResetAllAction extends BuildpathModifierAction {
 	public void run() {
 
 		try {
-	        final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-	        	@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+	        final IRunnableWithProgress runnable= monitor -> {
 
-        			monitor.beginTask("", 3); //$NON-NLS-1$
-	        		try {
-	        			if (!hasChange(fJavaProject))
-	        				return;
+				monitor.beginTask("", 3); //$NON-NLS-1$
+				try {
+					if (!hasChange(fJavaProject))
+						return;
 
-	        			BuildpathDelta delta= new BuildpathDelta(getToolTipText());
+					BuildpathDelta delta= new BuildpathDelta(getToolTipText());
 
-	        			ClasspathModifier.commitClassPath(fEntries, fJavaProject, monitor);
-        				delta.setNewEntries(fEntries.toArray(new CPListElement[fEntries.size()]));
+					ClasspathModifier.commitClassPath(fEntries, fJavaProject, monitor);
+					delta.setNewEntries(fEntries.toArray(new CPListElement[fEntries.size()]));
 
-	        			fJavaProject.setOutputLocation(fOutputLocation, monitor);
-	        			delta.setDefaultOutputLocation(fOutputLocation);
+					fJavaProject.setOutputLocation(fOutputLocation, monitor);
+					delta.setDefaultOutputLocation(fOutputLocation);
 
-						for (IResource resource : fProvider.getCreatedResources()) {
-							resource.delete(false, null);
-							delta.addDeletedResource(resource);
-						}
+					for (IResource resource : fProvider.getCreatedResources()) {
+						resource.delete(false, null);
+						delta.addDeletedResource(resource);
+					}
 
-	        			fProvider.resetCreatedResources();
+					fProvider.resetCreatedResources();
 
-	                    informListeners(delta);
+			        informListeners(delta);
 
-	            		selectAndReveal(new StructuredSelection(fJavaProject));
-	                } catch (CoreException e) {
-	                    showExceptionDialog(e, NewWizardMessages.NewSourceContainerWorkbookPage_ToolBar_ClearAll_tooltip);
-                    } finally {
-	                	monitor.done();
-	                }
-	        	}
-	        };
+					selectAndReveal(new StructuredSelection(fJavaProject));
+			    } catch (CoreException e) {
+			        showExceptionDialog(e, NewWizardMessages.NewSourceContainerWorkbookPage_ToolBar_ClearAll_tooltip);
+			    } finally {
+			    	monitor.done();
+			    }
+			};
 	        fContext.run(false, false, runnable);
         } catch (InvocationTargetException e) {
 			if (e.getCause() instanceof CoreException) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
index edd885a242..73a945d0fb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllOutputFoldersAction.java
@@ -70,14 +70,11 @@ public class ResetAllOutputFoldersAction extends BuildpathModifierAction {
 
 	@Override
 	public void run() {
-		final IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					resetOutputFolders(fJavaProject, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		final IRunnableWithProgress runnable= monitor -> {
+			try {
+				resetOutputFolders(fJavaProject, monitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 		try {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
index ff1faac57f..2452ffa758 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java
@@ -26,7 +26,6 @@ import org.eclipse.core.runtime.Assert;
 
 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.ISelection;
 import org.eclipse.jface.viewers.TableViewer;
@@ -88,12 +87,7 @@ public class CheckedListDialogField<E> extends ListDialogField<E> {
 		Table table= new Table(parent, SWT.CHECK | getListStyle());
 		table.setFont(parent.getFont());
 		CheckboxTableViewer tableViewer= new CheckboxTableViewer(table);
-		tableViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent e) {
-				doCheckStateChanged(e);
-			}
-		});
+		tableViewer.addCheckStateListener(e -> doCheckStateChanged(e));
 		return tableViewer;
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ComboDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ComboDialogField.java
index 65f5460944..e0ffa1b004 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ComboDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ComboDialogField.java
@@ -101,12 +101,7 @@ public class ComboDialogField extends DialogField {
 	public Combo getComboControl(Composite parent) {
 		if (fComboControl == null) {
 			assertCompositeNotNull(parent);
-			fModifyListener= new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					doModifyText(e);
-				}
-			};
+			fModifyListener= e -> doModifyText(e);
 			SelectionListener selectionListener= new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/DialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/DialogField.java
index 0fcfbe1ce6..0de5206774 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/DialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/DialogField.java
@@ -98,12 +98,7 @@ public class DialogField {
 	public void postSetFocusOnDialogField(Display display) {
 		if (display != null) {
 			display.asyncExec(
-				new Runnable() {
-					@Override
-					public void run() {
-						setFocus();
-					}
-				}
+				() -> setFocus()
 			);
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ListDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ListDialogField.java
index 7989014502..414181b0ca 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ListDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/ListDialogField.java
@@ -798,12 +798,9 @@ public class ListDialogField<E> extends DialogField {
 	public void postSetSelection(final ISelection selection) {
 		if (isOkToUse(fTableControl)) {
 			Display d= fTableControl.getDisplay();
-			d.asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (isOkToUse(fTableControl)) {
-						selectElements(selection);
-					}
+			d.asyncExec(() -> {
+				if (isOkToUse(fTableControl)) {
+					selectElements(selection);
 				}
 			});
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringDialogField.java
index fee3de8d43..9fd5382d8e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringDialogField.java
@@ -15,7 +15,6 @@
 package org.eclipse.jdt.internal.ui.wizards.dialogfields;
 
 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.widgets.Composite;
@@ -128,12 +127,7 @@ public class StringDialogField extends DialogField {
 	public Text getTextControl(Composite parent) {
 		if (fTextControl == null) {
 			assertCompositeNotNull(parent);
-			fModifyListener= new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					doModifyText();
-				}
-			};
+			fModifyListener= e -> doModifyText();
 
 			fTextControl= createTextControl(parent);
 			// moved up due to 1GEUNW2
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TextBoxDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TextBoxDialogField.java
index 039aacc9cd..b7f2ba2f1a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TextBoxDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TextBoxDialogField.java
@@ -15,8 +15,6 @@
 package org.eclipse.jdt.internal.ui.wizards.dialogfields;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
@@ -32,25 +30,22 @@ public class TextBoxDialogField extends StringDialogField {
 	@Override
 	protected Text createTextControl(Composite parent) {
 		Text text= new Text(parent, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		text.addTraverseListener(new TraverseListener() {
-			@Override
-			public void keyTraversed(TraverseEvent event) {
-				switch (event.detail) {
-					case SWT.TRAVERSE_ESCAPE:
-					case SWT.TRAVERSE_PAGE_NEXT:
-					case SWT.TRAVERSE_PAGE_PREVIOUS:
+		text.addTraverseListener(event -> {
+			switch (event.detail) {
+				case SWT.TRAVERSE_ESCAPE:
+				case SWT.TRAVERSE_PAGE_NEXT:
+				case SWT.TRAVERSE_PAGE_PREVIOUS:
+					event.doit= true;
+					break;
+				case SWT.TRAVERSE_RETURN:
+				case SWT.TRAVERSE_TAB_NEXT:
+				case SWT.TRAVERSE_TAB_PREVIOUS:
+					if ((event.stateMask & SWT.MODIFIER_MASK) != 0) {
 						event.doit= true;
-						break;
-					case SWT.TRAVERSE_RETURN:
-					case SWT.TRAVERSE_TAB_NEXT:
-					case SWT.TRAVERSE_TAB_PREVIOUS:
-						if ((event.stateMask & SWT.MODIFIER_MASK) != 0) {
-							event.doit= true;
-						}
-						break;
-				}
-
+					}
+					break;
 			}
+
 		});
 		return text;
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TreeListDialogField.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TreeListDialogField.java
index 0201592516..21b361adff 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TreeListDialogField.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/TreeListDialogField.java
@@ -712,12 +712,9 @@ public class TreeListDialogField<E> extends DialogField {
 	public void postSetSelection(final ISelection selection) {
 		if (isOkToUse(fTreeControl)) {
 			Display d= fTreeControl.getDisplay();
-			d.asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (isOkToUse(fTreeControl)) {
-						selectElements(selection);
-					}
+			d.asyncExec(() -> {
+				if (isOkToUse(fTreeControl)) {
+					selectElements(selection);
 				}
 			});
 		}