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

For org.eclipse.jdt.ui - part 3

Change-Id: I9379becb6b0398a7f2fcc7727481998d1e44e270

25 files changed, 186 insertions, 340 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
index 7e9f5eba1d..4a6cb93dd1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementContentProvider.java
@@ -234,14 +234,11 @@ public class JavaElementContentProvider extends StandardJavaElementContentProvid
 	 * Updates the package icon
 	 */
 	 private void updatePackageIcon(final IJavaElement element) {
-	 	postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.update(element, new String[]{IBasicPropertyConstants.P_IMAGE});
-			}
+	 	postRunnable(() -> {
+			// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.update(element, new String[]{IBasicPropertyConstants.P_IMAGE});
 		});
 	 }
 
@@ -284,38 +281,29 @@ public class JavaElementContentProvider extends StandardJavaElementContentProvid
 	}
 
 	private void postRefresh(final Object root) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.refresh(root);
-			}
+		postRunnable(() -> {
+			// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.refresh(root);
 		});
 	}
 
 	private void postAdd(final Object parent, final Object element) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.add(parent, element);
-			}
+		postRunnable(() -> {
+			// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.add(parent, element);
 		});
 	}
 
 	private void postRemove(final Object element) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.remove(element);
-			}
+		postRunnable(() -> {
+			// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.remove(element);
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
index b2843cf56b..53a3f58bd2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddGetterSetterAction.java
@@ -619,19 +619,15 @@ public class AddGetterSetterAction extends SelectionDispatchAction {
 	}
 
 	private IRequestQuery skipReplaceQuery() {
-		return new IRequestQuery() {
-
-			@Override
-			public int doQuery(IMember method) {
-				int[] returnCodes= { IRequestQuery.YES, IRequestQuery.NO, IRequestQuery.YES_ALL, IRequestQuery.CANCEL};
-				String skipLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_skip_label;
-				String replaceLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_replace_label;
-				String skipAllLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_skipAll_label;
-				String[] options= { skipLabel, replaceLabel, skipAllLabel, IDialogConstants.CANCEL_LABEL};
-				String methodName= JavaElementLabels.getElementLabel(method, JavaElementLabels.M_PARAMETER_TYPES);
-				String formattedMessage= Messages.format(ActionMessages.AddGetterSetterAction_SkipExistingDialog_message, BasicElementLabels.getJavaElementName(methodName));
-				return showQueryDialog(formattedMessage, options, returnCodes);
-			}
+		return method -> {
+			int[] returnCodes= { IRequestQuery.YES, IRequestQuery.NO, IRequestQuery.YES_ALL, IRequestQuery.CANCEL};
+			String skipLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_skip_label;
+			String replaceLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_replace_label;
+			String skipAllLabel= ActionMessages.AddGetterSetterAction_SkipExistingDialog_skipAll_label;
+			String[] options= { skipLabel, replaceLabel, skipAllLabel, IDialogConstants.CANCEL_LABEL};
+			String methodName= JavaElementLabels.getElementLabel(method, JavaElementLabels.M_PARAMETER_TYPES);
+			String formattedMessage= Messages.format(ActionMessages.AddGetterSetterAction_SkipExistingDialog_message, BasicElementLabels.getJavaElementName(methodName));
+			return showQueryDialog(formattedMessage, options, returnCodes);
 		};
 	}
 
@@ -642,14 +638,10 @@ public class AddGetterSetterAction extends SelectionDispatchAction {
 			return IRequestQuery.CANCEL;
 		}
 		final int[] result= { Window.CANCEL};
-		shell.getDisplay().syncExec(new Runnable() {
-
-			@Override
-			public void run() {
-				String title= ActionMessages.AddGetterSetterAction_QueryDialog_title;
-				MessageDialog dialog= new MessageDialog(shell, title, null, message, MessageDialog.QUESTION, buttonLabels, 0);
-				result[0]= dialog.open();
-			}
+		shell.getDisplay().syncExec(() -> {
+			String title= ActionMessages.AddGetterSetterAction_QueryDialog_title;
+			MessageDialog dialog= new MessageDialog(shell, title, null, message, MessageDialog.QUESTION, buttonLabels, 0);
+			result[0]= dialog.open();
 		});
 		int returnVal= result[0];
 		return returnVal < 0 ? IRequestQuery.CANCEL : returnCodes[returnVal];
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/CustomFiltersActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/CustomFiltersActionGroup.java
index 50d2e0d05b..c081ef642a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/CustomFiltersActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/CustomFiltersActionGroup.java
@@ -450,12 +450,9 @@ public class CustomFiltersActionGroup extends ActionGroup {
 		viewMenu.add(new ShowFilterDialogAction());
 
 		fMenuManager= viewMenu;
-		fMenuListener= new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				removePreviousLRUFilterActions(manager);
-				addLRUFilterActions(manager);
-			}
+		fMenuListener= manager -> {
+			removePreviousLRUFilterActions(manager);
+			addLRUFilterActions(manager);
 		};
 		fMenuManager.addMenuListener(fMenuListener);
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java
index 36faf012bb..60eb60417b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java
@@ -43,10 +43,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.ITextSelection;
@@ -206,14 +204,11 @@ public class ExternalizeStringsAction extends SelectionDispatchAction {
 	}
 
 	private IRunnableWithProgress createRunnable(final IStructuredSelection selection) {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					fElements= doRun(selection, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		return pm -> {
+			try {
+				fElements= doRun(selection, pm);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}
@@ -474,12 +469,9 @@ public class ExternalizeStringsAction extends SelectionDispatchAction {
 		@Override
 		protected Control createDialogArea(Composite parent) {
 			Composite result= (Composite)super.createDialogArea(parent);
-			getTableViewer().addSelectionChangedListener(new ISelectionChangedListener(){
-				@Override
-				public void selectionChanged(SelectionChangedEvent event){
-					if (fOpenButton != null){
-						fOpenButton.setEnabled(! getTableViewer().getSelection().isEmpty());
-					}
+			getTableViewer().addSelectionChangedListener(event -> {
+				if (fOpenButton != null){
+					fOpenButton.setEnabled(! getTableViewer().getSelection().isEmpty());
 				}
 			});
 			getTableViewer().getTable().addSelectionListener(new SelectionAdapter(){
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java
index f3d662459f..dcface45dd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java
@@ -41,10 +41,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 
 import org.eclipse.jface.text.BadLocationException;
 
@@ -162,14 +160,11 @@ public class FindStringsToExternalizeAction extends SelectionDispatchAction {
 	}
 
 	private IRunnableWithProgress createRunnable(final IStructuredSelection selection) {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					fElements= doRun(selection, pm);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		return pm -> {
+			try {
+				fElements= doRun(selection, pm);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}
@@ -376,12 +371,9 @@ public class FindStringsToExternalizeAction extends SelectionDispatchAction {
 		@Override
 		protected Control createDialogArea(Composite parent) {
 			Composite result= (Composite)super.createDialogArea(parent);
-			getTableViewer().addSelectionChangedListener(new ISelectionChangedListener(){
-				@Override
-				public void selectionChanged(SelectionChangedEvent event){
-					if (fOpenButton != null){
-						fOpenButton.setEnabled(! getTableViewer().getSelection().isEmpty());
-					}
+			getTableViewer().addSelectionChangedListener(event -> {
+				if (fOpenButton != null){
+					fOpenButton.setEnabled(! getTableViewer().getSelection().isEmpty());
 				}
 			});
 			getTableViewer().getTable().addSelectionListener(new SelectionAdapter(){
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/MemberFilterActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/MemberFilterActionGroup.java
index 4e69dbd39c..290ae227a2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/MemberFilterActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/MemberFilterActionGroup.java
@@ -247,12 +247,7 @@ public class MemberFilterActionGroup extends ActionGroup {
 		}
 		if (refresh) {
 			fViewer.getControl().setRedraw(false);
-			BusyIndicator.showWhile(fViewer.getControl().getDisplay(), new Runnable() {
-				@Override
-				public void run() {
-					fViewer.refresh();
-				}
-			});
+			BusyIndicator.showWhile(fViewer.getControl().getDisplay(), () -> fViewer.refresh());
 			fViewer.getControl().setRedraw(true);
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenAttachedJavadocAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenAttachedJavadocAction.java
index 0eec838b10..169c347cc0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenAttachedJavadocAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenAttachedJavadocAction.java
@@ -203,14 +203,11 @@ public class OpenAttachedJavadocAction extends SelectionDispatchAction {
 	}
 
 	private static void showMessage(final Shell shell, final String message, final boolean isError) {
-		Display.getDefault().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				if (isError) {
-					MessageDialog.openError(shell, getTitle(), message);
-				} else {
-					MessageDialog.openInformation(shell, getTitle(), message);
-				}
+		Display.getDefault().asyncExec(() -> {
+			if (isError) {
+				MessageDialog.openError(shell, getTitle(), message);
+			} else {
+				MessageDialog.openInformation(shell, getTitle(), message);
 			}
 		});
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenProjectAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenProjectAction.java
index 694773abce..f3739a6f1c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenProjectAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OpenProjectAction.java
@@ -19,7 +19,6 @@ import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.SubProgressMonitor;
@@ -187,25 +186,22 @@ public class OpenProjectAction extends SelectionDispatchAction implements IResou
 	}
 
 	private IWorkspaceRunnable createRunnable(final Object[] projects) {
-		return new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				monitor.beginTask("", projects.length); //$NON-NLS-1$
-				MultiStatus errorStatus= null;
-				for (Object p : projects) {
-					IProject project= (IProject) p;
-					try {
-						project.open(IResource.BACKGROUND_REFRESH, new SubProgressMonitor(monitor, 1));
-					} catch (CoreException e) {
-						if (errorStatus == null)
-							errorStatus = new MultiStatus(JavaPlugin.getPluginId(), IStatus.ERROR, ActionMessages.OpenProjectAction_error_message, null);
-						errorStatus.add(e.getStatus());
-					}
+		return monitor -> {
+			monitor.beginTask("", projects.length); //$NON-NLS-1$
+			MultiStatus errorStatus= null;
+			for (Object p : projects) {
+				IProject project= (IProject) p;
+				try {
+					project.open(IResource.BACKGROUND_REFRESH, new SubProgressMonitor(monitor, 1));
+				} catch (CoreException e) {
+					if (errorStatus == null)
+						errorStatus = new MultiStatus(JavaPlugin.getPluginId(), IStatus.ERROR, ActionMessages.OpenProjectAction_error_message, null);
+					errorStatus.add(e.getStatus());
 				}
-				monitor.done();
-				if (errorStatus != null)
-					throw new CoreException(errorStatus);
 			}
+			monitor.done();
+			if (errorStatus != null)
+				throw new CoreException(errorStatus);
 		};
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
index a30f744093..1e8140786c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/OrganizeImportsAction.java
@@ -324,12 +324,7 @@ public class OrganizeImportsAction extends SelectionDispatchAction {
 	}
 
 	private IChooseImportQuery createChooseImportQuery(final JavaEditor editor) {
-		return new IChooseImportQuery() {
-			@Override
-			public TypeNameMatch[] chooseImports(TypeNameMatch[][] openChoices, ISourceRange[] ranges) {
-				return doChooseImports(openChoices, ranges, editor);
-			}
-		};
+		return (openChoices, ranges) -> doChooseImports(openChoices, ranges, editor);
 	}
 
 	private TypeNameMatch[] doChooseImports(TypeNameMatch[][] openChoices, final ISourceRange[] ranges, final JavaEditor editor) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ProjectActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ProjectActionGroup.java
index ec35d2d353..254a9434c8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ProjectActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ProjectActionGroup.java
@@ -28,7 +28,6 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 
 import org.eclipse.ui.IActionBars;
@@ -110,13 +109,10 @@ public class ProjectActionGroup extends ActionGroup {
 			fCloseUnrelatedAction.selectionChanged(s);
 		}
 
-		fSelectionChangedListener= new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection s= event.getSelection();
-				if (s instanceof IStructuredSelection) {
-					performSelectionChanged((IStructuredSelection) s);
-				}
+		fSelectionChangedListener= event -> {
+			ISelection s= event.getSelection();
+			if (s instanceof IStructuredSelection) {
+				performSelectionChanged((IStructuredSelection) s);
 			}
 		};
 		selectionProvider.addSelectionChangedListener(fSelectionChangedListener);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefactorActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefactorActionGroup.java
index 5208d7271e..10cd7dc2b9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefactorActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefactorActionGroup.java
@@ -29,7 +29,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 
 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;
@@ -566,12 +565,7 @@ public class RefactorActionGroup extends ActionGroup {
 		if (fEditor != null) {
 			final ITypeRoot element= getEditorInput();
 			if (element != null && ActionUtil.isOnBuildPath(element)) {
-				refactorSubmenu.addMenuListener(new IMenuListener() {
-					@Override
-					public void menuAboutToShow(IMenuManager manager) {
-						refactorMenuShown(manager);
-					}
-				});
+				refactorSubmenu.addMenuListener(manager -> refactorMenuShown(manager));
 				refactorSubmenu.add(fNoActionAvailable);
 				menu.appendToGroup(fGroupName, refactorSubmenu);
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefreshAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefreshAction.java
index 120a0ed1fe..220719bce2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefreshAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RefreshAction.java
@@ -173,12 +173,7 @@ public class RefreshAction extends SelectionDispatchAction {
 
 	@Override
 	public void run(final IStructuredSelection selection) {
-		IWorkspaceRunnable operation= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				performRefresh(selection, monitor);
-			}
-		};
+		IWorkspaceRunnable operation= monitor -> performRefresh(selection, monitor);
 		new WorkbenchRunnableAdapter(operation).runAsUserJob(ActionMessages.RefreshAction_refresh_operation_label, null);
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RemoveFromClasspathAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RemoveFromClasspathAction.java
index 29ed53b106..86340c557d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RemoveFromClasspathAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/RemoveFromClasspathAction.java
@@ -18,12 +18,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 
@@ -89,21 +86,18 @@ public class RemoveFromClasspathAction extends SelectionDispatchAction {
 	@Override
 	public void run(final IStructuredSelection selection) {
 		try {
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, true, new WorkbenchRunnableAdapter(new IWorkspaceRunnable() {
-				@Override
-				public void run(IProgressMonitor pm) throws CoreException {
-					try{
-						IPackageFragmentRoot[] roots= getRootsToRemove(selection);
-						pm.beginTask(ActionMessages.RemoveFromClasspathAction_Removing, roots.length);
-						for (IPackageFragmentRoot root : roots) {
-							int jCoreFlags= IPackageFragmentRoot.NO_RESOURCE_MODIFICATION | IPackageFragmentRoot.ORIGINATING_PROJECT_CLASSPATH;
-							root.delete(IResource.NONE, jCoreFlags, new SubProgressMonitor(pm, 1));
-						}
-					} finally {
-						pm.done();
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, true, new WorkbenchRunnableAdapter(pm -> {
+				try{
+					IPackageFragmentRoot[] roots= getRootsToRemove(selection);
+					pm.beginTask(ActionMessages.RemoveFromClasspathAction_Removing, roots.length);
+					for (IPackageFragmentRoot root : roots) {
+						int jCoreFlags= IPackageFragmentRoot.NO_RESOURCE_MODIFICATION | IPackageFragmentRoot.ORIGINATING_PROJECT_CLASSPATH;
+						root.delete(IResource.NONE, jCoreFlags, new SubProgressMonitor(pm, 1));
 					}
+				} finally {
+					pm.done();
 				}
-		}));
+			}));
 		} catch (InvocationTargetException e) {
 			ExceptionHandler.handle(e, getShell(),
 					ActionMessages.RemoveFromClasspathAction_exception_dialog_title,
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter3.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter3.java
index 9df272692b..5b73e90ddc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter3.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/jarpackager/JarWriter3.java
@@ -27,7 +27,6 @@ import java.io.OutputStream;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -303,17 +302,13 @@ public class JarWriter3 {
 		Assert.isNotNull(path);
 		Assert.isNotNull(monitor);
 		final RefactoringDescriptorProxy[] proxies= data.getRefactoringDescriptors();
-		Arrays.sort(proxies, new Comparator<RefactoringDescriptorProxy>() {
-
-			@Override
-			public final int compare(final RefactoringDescriptorProxy first, final RefactoringDescriptorProxy second) {
-				final long delta= first.getTimeStamp() - second.getTimeStamp();
-				if (delta > 0)
-					return 1;
-				else if (delta < 0)
-					return -1;
-				return 0;
-			}
+		Arrays.sort(proxies, (first, second) -> {
+			final long delta= first.getTimeStamp() - second.getTimeStamp();
+			if (delta > 0)
+				return 1;
+			else if (delta < 0)
+				return -1;
+			return 0;
 		});
 		File file= null;
 		OutputStream output= null;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/refactoring/RefactoringSaveHelper.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/refactoring/RefactoringSaveHelper.java
index d8136517f9..7613006a15 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/refactoring/RefactoringSaveHelper.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/refactoring/RefactoringSaveHelper.java
@@ -27,7 +27,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.IncrementalProjectBuilder;
@@ -140,19 +139,16 @@ public class RefactoringSaveHelper {
 					if (!JavaPlugin.getActiveWorkbenchWindow().getWorkbench().saveAllEditors(false))
 						return false;
 				} else {
-					IRunnableWithProgress runnable= new IRunnableWithProgress() {
-						@Override
-						public void run(IProgressMonitor pm) throws InterruptedException {
-							int count= dirtyEditors.length;
-							pm.beginTask("", count); //$NON-NLS-1$
-							for (int i= 0; i < count; i++) {
-								IEditorPart editor= dirtyEditors[i];
-								editor.doSave(new SubProgressMonitor(pm, 1));
-								if (pm.isCanceled())
-									throw new InterruptedException();
-							}
-							pm.done();
+					IRunnableWithProgress runnable= pm -> {
+						int count= dirtyEditors.length;
+						pm.beginTask("", count); //$NON-NLS-1$
+						for (int i= 0; i < count; i++) {
+							IEditorPart editor= dirtyEditors[i];
+							editor.doSave(new SubProgressMonitor(pm, 1));
+							if (pm.isCanceled())
+								throw new InterruptedException();
 						}
+						pm.done();
 					};
 					try {
 						PlatformUI.getWorkbench().getProgressService().runInUI(JavaPlugin.getActiveWorkbenchWindow(), runnable, null);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/JavaSourceViewerConfiguration.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/JavaSourceViewerConfiguration.java
index 0f7f2a7f37..18631318f9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/JavaSourceViewerConfiguration.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/JavaSourceViewerConfiguration.java
@@ -19,7 +19,6 @@ import java.util.Arrays;
 import java.util.Map;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
@@ -32,7 +31,6 @@ import org.eclipse.jface.text.AbstractInformationControlManager;
 import org.eclipse.jface.text.DefaultInformationControl;
 import org.eclipse.jface.text.IAutoEditStrategy;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.ITextHover;
@@ -461,12 +459,7 @@ public class JavaSourceViewerConfiguration extends TextSourceViewerConfiguration
 			ContentAssistPreference.configure(assistant, fPreferenceStore);
 
 			assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
-			assistant.setInformationControlCreator(new IInformationControlCreator() {
-				@Override
-				public IInformationControl createInformationControl(Shell parent) {
-					return new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString());
-				}
-			});
+			assistant.setInformationControlCreator(parent -> new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString()));
 
 			return assistant;
 		}
@@ -773,12 +766,7 @@ public class JavaSourceViewerConfiguration extends TextSourceViewerConfiguration
 	 */
 	@Override
 	public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, false);
-			}
-		};
+		return parent -> new DefaultInformationControl(parent, false);
 	}
 
 	/**
@@ -791,12 +779,7 @@ public class JavaSourceViewerConfiguration extends TextSourceViewerConfiguration
 	 * @since 2.1
 	 */
 	private IInformationControlCreator getInformationPresenterControlCreator(ISourceViewer sourceViewer) {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, true);
-			}
-		};
+		return parent -> new DefaultInformationControl(parent, true);
 	}
 
 	/**
@@ -810,24 +793,18 @@ public class JavaSourceViewerConfiguration extends TextSourceViewerConfiguration
 	 * @since 2.1
 	 */
 	private IInformationControlCreator getOutlinePresenterControlCreator(ISourceViewer sourceViewer, final String commandId) {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				int shellStyle= SWT.RESIZE;
-				int treeStyle= SWT.V_SCROLL | SWT.H_SCROLL;
-				return new JavaOutlineInformationControl(parent, shellStyle, treeStyle, commandId);
-			}
+		return parent -> {
+			int shellStyle= SWT.RESIZE;
+			int treeStyle= SWT.V_SCROLL | SWT.H_SCROLL;
+			return new JavaOutlineInformationControl(parent, shellStyle, treeStyle, commandId);
 		};
 	}
 
 	private IInformationControlCreator getHierarchyPresenterControlCreator() {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				int shellStyle= SWT.RESIZE;
-				int treeStyle= SWT.V_SCROLL | SWT.H_SCROLL;
-				return new HierarchyInformationControl(parent, shellStyle, treeStyle);
-			}
+		return parent -> {
+			int shellStyle= SWT.RESIZE;
+			int treeStyle= SWT.V_SCROLL | SWT.H_SCROLL;
+			return new HierarchyInformationControl(parent, shellStyle, treeStyle);
 		};
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
index 43fa841944..df117291c8 100755
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
@@ -1411,12 +1411,7 @@ public class DefaultJavaFoldingStructureProvider implements IJavaFoldingStructur
 			}
 		}
 
-		Comparator<Tuple> comparator= new Comparator<Tuple>() {
-			@Override
-			public int compare(Tuple o1, Tuple o2) {
-				return o1.position.getOffset() - o2.position.getOffset();
-			}
-		};
+		Comparator<Tuple> comparator= (o1, o2) -> o1.position.getOffset() - o2.position.getOffset();
 		for (List<Tuple> list : map.values()) {
 			Collections.sort(list, comparator);
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/correction/ChangeCorrectionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/correction/ChangeCorrectionProposal.java
index c5a874404e..3c822b60b2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/correction/ChangeCorrectionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/correction/ChangeCorrectionProposal.java
@@ -16,7 +16,6 @@ package org.eclipse.jdt.ui.text.java.correction;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.TraverseEvent;
 import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
@@ -156,12 +155,9 @@ public class ChangeCorrectionProposal extends ChangeCorrectionProposalCore imple
 						disabledStyledText= (StyledText) control;
 						if (disabledStyledText.getEditable()) {
 							disabledStyledText.setEditable(false);
-							traverseBlocker= new TraverseListener() {
-								@Override
-								public void keyTraversed(TraverseEvent e) {
-									e.doit= true;
-									e.detail= SWT.TRAVERSE_NONE;
-								}
+							traverseBlocker= e -> {
+								e.doit= true;
+								e.detail= SWT.TRAVERSE_NONE;
 							};
 							disabledStyledText.addTraverseListener(traverseBlocker);
 						} else {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java
index c57a97acf4..788d768384 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java
@@ -204,14 +204,11 @@ public class JavaCapabilityConfigurationPage extends NewElementWizardPage {
 	 */
 	public IRunnableWithProgress getRunnable() {
 		if (getJavaProject() != null) {
-			return new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						configureJavaProject(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
+			return monitor -> {
+				try {
+					configureJavaProject(monitor);
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewAnnotationWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewAnnotationWizardPage.java
index 1b19f622cd..b3dda67aad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewAnnotationWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewAnnotationWizardPage.java
@@ -50,7 +50,6 @@ import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
 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.SelectionButtonDialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFieldGroup;
 
@@ -219,12 +218,7 @@ public class NewAnnotationWizardPage extends NewTypeWizardPage {
 
 			fEnumButtons= new SelectionButtonDialogFieldGroup(style, enumLabels, nColumns);
 
-			fEnableButton.setDialogFieldListener(new IDialogFieldListener() {
-				@Override
-				public void dialogFieldChanged(DialogField field) {
-					fEnumButtons.setEnabled(fEnableButton.isSelected());
-				}
-			});
+			fEnableButton.setDialogFieldListener(field -> fEnumButtons.setEnabled(fEnableButton.isSelected()));
 		}
 
 		private String[] toStringArray(Class<E> enumClass) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java
index 91579b9386..a103eedac8 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java
@@ -26,7 +26,6 @@ import org.eclipse.core.filesystem.URIUtil;
 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.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubProgressMonitor;
@@ -303,33 +302,30 @@ public class NewJavaProjectWizardPage extends NewElementWizardPage {
 	 * @return the runnable
 	 */
 	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				if (monitor == null) {
-					monitor= new NullProgressMonitor();
-				}
-				monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPage_op_desc, 10);
-				// initialize if needed
-				if (fProjectModified || isNewProjectHandle()) {
-					initBuildPaths();
-				}
-
-				// create the project
-				try {
-					IPath locationPath= getLocationPath();
-					BuildPathsBlock.createProject(getProjectHandle(),
-						locationPath != null ? URIUtil.toURI(locationPath) : null,
-						new SubProgressMonitor(monitor, 2));
-					BuildPathsBlock.addJavaNature(getProjectHandle(), new SubProgressMonitor(monitor, 2));
-					fBuildPathsBlock.configureJavaProject(new SubProgressMonitor(monitor, 6));
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} catch (OperationCanceledException e) {
-					throw new InterruptedException();
-				} finally {
-					monitor.done();
-				}
+		return monitor -> {
+			if (monitor == null) {
+				monitor= new NullProgressMonitor();
+			}
+			monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPage_op_desc, 10);
+			// initialize if needed
+			if (fProjectModified || isNewProjectHandle()) {
+				initBuildPaths();
+			}
+
+			// create the project
+			try {
+				IPath locationPath= getLocationPath();
+				BuildPathsBlock.createProject(getProjectHandle(),
+					locationPath != null ? URIUtil.toURI(locationPath) : null,
+					new SubProgressMonitor(monitor, 2));
+				BuildPathsBlock.addJavaNature(getProjectHandle(), new SubProgressMonitor(monitor, 2));
+				fBuildPathsBlock.configureJavaProject(new SubProgressMonitor(monitor, 6));
+			} catch (CoreException e1) {
+				throw new InvocationTargetException(e1);
+			} catch (OperationCanceledException e2) {
+				throw new InterruptedException();
+			} finally {
+				monitor.done();
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
index ae3418dcd2..fd8ad9cc3e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageOne.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -463,18 +462,15 @@ public class NewJavaProjectWizardPageOne extends WizardPage {
 			fDefaultJVMLabel= getDefaultJVMLabel();
 
 			fInstalledJVMs= getWorkspaceJREs();
-			Arrays.sort(fInstalledJVMs, new Comparator<IVMInstall>() {
-				@Override
-				public int compare(IVMInstall i0, IVMInstall i1) {
-					if (i1 instanceof IVMInstall2 && i0 instanceof IVMInstall2) {
-						String cc0= JavaModelUtil.getCompilerCompliance((IVMInstall2) i0, JavaCore.VERSION_1_4);
-						String cc1= JavaModelUtil.getCompilerCompliance((IVMInstall2) i1, JavaCore.VERSION_1_4);
-						int result= JavaCore.compareJavaVersions(cc1, cc0);
-						if (result != 0)
-							return result;
-					}
-					return Policy.getComparator().compare(i0.getName(), i1.getName());
+			Arrays.sort(fInstalledJVMs, (i0, i1) -> {
+				if (i1 instanceof IVMInstall2 && i0 instanceof IVMInstall2) {
+					String cc0= JavaModelUtil.getCompilerCompliance((IVMInstall2) i0, JavaCore.VERSION_1_4);
+					String cc1= JavaModelUtil.getCompilerCompliance((IVMInstall2) i1, JavaCore.VERSION_1_4);
+					int result= JavaCore.compareJavaVersions(cc1, cc0);
+					if (result != 0)
+						return result;
 				}
+				return Policy.getComparator().compare(i0.getName(), i1.getName());
 			});
 
 			fInstalledEEs= JavaRuntime.getExecutionEnvironmentsManager().getExecutionEnvironments();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageTwo.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageTwo.java
index f49c2c0b51..dc40567c5d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageTwo.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageTwo.java
@@ -529,12 +529,7 @@ public class NewJavaProjectWizardPageTwo extends JavaCapabilityConfigurationPage
 			return;
 		}
 
-		IRunnableWithProgress op= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				doRemoveProject(monitor);
-			}
-		};
+		IRunnableWithProgress op= monitor -> doRemoveProject(monitor);
 
 		try {
 			getContainer().run(true, true, new WorkspaceModifyDelegatingOperation(op));
@@ -609,13 +604,10 @@ public class NewJavaProjectWizardPageTwo extends JavaCapabilityConfigurationPage
 		if (compilerCompliance!= null && JavaModelUtil.is9OrHigher(compilerCompliance)) {
 			boolean createModuleInfoFile= isCreateModuleInfoFile();
 			if (createModuleInfoFile) {
-				Display.getDefault().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						CreateModuleInfoAction action= new CreateModuleInfoAction();
-						action.selectionChanged(null, new StructuredSelection(getJavaProject()));
-						action.run(null);
-					}
+				Display.getDefault().asyncExec(() -> {
+					CreateModuleInfoAction action= new CreateModuleInfoAction();
+					action.selectionChanged(null, new StructuredSelection(getJavaProject()));
+					action.run(null);
 				});
 
 			}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java
index 6d1f289d47..0c1dfe9f5e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java
@@ -487,14 +487,11 @@ public class NewPackageWizardPage extends NewTypeWizardPage {
 	 */
 	@Override
 	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					createPackage(monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		return monitor -> {
+			try {
+				createPackage(monitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
index 27f9262182..98d6184169 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewTypeWizardPage.java
@@ -32,8 +32,6 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -897,22 +895,19 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage {
 		LayoutUtil.setWidthHint(text, getMaxFieldWidth());
 		TextFieldNavigationHandler.install(text);
 
-		text.addVerifyListener(new VerifyListener() {
-			@Override
-			public void verifyText(VerifyEvent e) {
-				if (fCanModifyPackage && ! fEnclosingTypeSelection.isSelected() && e.start == 0 && e.end == ((Text) e.widget).getCharCount()) {
-					String typeNameWithoutParameters= getTypeNameWithoutParameters(getTypeNameWithoutExtension(e.text));
-					int lastDot= typeNameWithoutParameters.lastIndexOf('.');
-					if (lastDot == -1 || lastDot == typeNameWithoutParameters.length() - 1)
-						return;
+		text.addVerifyListener(e -> {
+			if (fCanModifyPackage && ! fEnclosingTypeSelection.isSelected() && e.start == 0 && e.end == ((Text) e.widget).getCharCount()) {
+				String typeNameWithoutParameters= getTypeNameWithoutParameters(getTypeNameWithoutExtension(e.text));
+				int lastDot= typeNameWithoutParameters.lastIndexOf('.');
+				if (lastDot == -1 || lastDot == typeNameWithoutParameters.length() - 1)
+					return;
 
-					String pack= typeNameWithoutParameters.substring(0, lastDot);
-					if (validatePackageName(pack, null).getSeverity() == IStatus.ERROR)
-						return;
+				String pack= typeNameWithoutParameters.substring(0, lastDot);
+				if (validatePackageName(pack, null).getSeverity() == IStatus.ERROR)
+					return;
 
-					fPackageDialogField.setText(pack);
-					e.text= e.text.substring(lastDot + 1);
-				}
+				fPackageDialogField.setText(pack);
+				e.text= e.text.substring(lastDot + 1);
 			}
 		});
 	}
@@ -2829,17 +2824,14 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage {
 	 * @return the runnable to create the new type
 	 */
 	public IRunnableWithProgress getRunnable() {
-		return new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				try {
-					if (monitor == null) {
-						monitor= new NullProgressMonitor();
-					}
-					createType(monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
+		return monitor -> {
+			try {
+				if (monitor == null) {
+					monitor= new NullProgressMonitor();
 				}
+				createType(monitor);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 	}