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

For org.eclipse.jdt.ui - part 2

Change-Id: Idd7ae62e7f323b167b4f53d74f64629516ccce99

46 files changed, 481 insertions, 989 deletions

diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionHandler.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionHandler.java
index 7cb9f493be..20a534d7ee 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionHandler.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionHandler.java
@@ -142,20 +142,17 @@ public class ChangeExceptionHandler {
 	}
 
 	private void performUndo(final Change undo) {
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				monitor.beginTask("", 11);  //$NON-NLS-1$
-				try {
-					undo.initializeValidationData(new NotCancelableProgressMonitor(new SubProgressMonitor(monitor, 1)));
-					if (undo.isValid(new SubProgressMonitor(monitor,1)).hasFatalError()) {
-						monitor.done();
-						return;
-					}
-					undo.perform(new SubProgressMonitor(monitor, 9));
-				} finally {
-					undo.dispose();
+		IWorkspaceRunnable runnable= monitor -> {
+			monitor.beginTask("", 11);  //$NON-NLS-1$
+			try {
+				undo.initializeValidationData(new NotCancelableProgressMonitor(new SubProgressMonitor(monitor, 1)));
+				if (undo.isValid(new SubProgressMonitor(monitor,1)).hasFatalError()) {
+					monitor.done();
+					return;
 				}
+				undo.perform(new SubProgressMonitor(monitor, 9));
+			} finally {
+				undo.dispose();
 			}
 		};
 		WorkbenchRunnableAdapter adapter= new WorkbenchRunnableAdapter(runnable,
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java
index 316f87706e..280ac855b8 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeExceptionsControl.java
@@ -31,19 +31,16 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.window.Window;
 
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
@@ -152,12 +149,7 @@ public class ChangeExceptionsControl extends Composite {
 		fTableViewer.setUseHashlookup(true);
 		fTableViewer.setContentProvider(new ExceptionInfoContentProvider());
 		fTableViewer.setLabelProvider(new ExceptionInfoLabelProvider());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonsEnabledState();
-			}
-		});
+		fTableViewer.addSelectionChangedListener(event -> updateButtonsEnabledState());
 	}
 
 	private ExceptionInfo[] getSelectedItems() {
@@ -256,17 +248,14 @@ public class ChangeExceptionsControl extends Composite {
 		dialog.setTitle(RefactoringMessages.ChangeExceptionsControl_choose_title);
 		dialog.setMessage(RefactoringMessages.ChangeExceptionsControl_choose_message);
 		dialog.setInitialPattern("*Exception*"); //$NON-NLS-1$
-		dialog.setValidator(new ISelectionStatusValidator() {
-			@Override
-			public IStatus validate(Object[] selection) {
-				if (selection.length == 0)
-					return new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
-				try {
-					return checkException((IType)selection[0]);
-				} catch (JavaModelException e) {
-					JavaPlugin.log(e);
-					return StatusInfo.OK_STATUS;
-				}
+		dialog.setValidator(selection -> {
+			if (selection.length == 0)
+				return new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
+			try {
+				return checkException((IType)selection[0]);
+			} catch (JavaModelException e) {
+				JavaPlugin.log(e);
+				return StatusInfo.OK_STATUS;
 			}
 		});
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
index a63a97dc46..298f6b82a0 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java
@@ -23,8 +23,6 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -44,13 +42,11 @@ import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -322,20 +318,12 @@ public class ChangeParametersControl extends Composite {
 		fTableViewer.setUseHashlookup(true);
 		fTableViewer.setContentProvider(new ParameterInfoContentProvider());
 		fTableViewer.setLabelProvider(new ParameterInfoLabelProvider());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonsEnabledState();
-			}
-		});
+		fTableViewer.addSelectionChangedListener(event -> updateButtonsEnabledState());
 
-		table.addTraverseListener(new TraverseListener() {
-			@Override
-			public void keyTraversed(TraverseEvent e) {
-				if (e.detail == SWT.TRAVERSE_RETURN && e.stateMask == SWT.NONE) {
-					editColumnOrNextPossible(0);
-					e.detail= SWT.TRAVERSE_NONE;
-				}
+		table.addTraverseListener(e -> {
+			if (e.detail == SWT.TRAVERSE_RETURN && e.stateMask == SWT.NONE) {
+				editColumnOrNextPossible(0);
+				e.detail= SWT.TRAVERSE_NONE;
 			}
 		});
 		table.addKeyListener(new KeyAdapter() {
@@ -612,35 +600,29 @@ public class ChangeParametersControl extends Composite {
 			final int editorColumn= i;
 			final TableTextCellEditor editor = editors[i];
 			// support tabbing between columns while editing:
-			editor.getText().addTraverseListener(new TraverseListener() {
-				@Override
-				public void keyTraversed(TraverseEvent e) {
-					switch (e.detail) {
-						case SWT.TRAVERSE_TAB_NEXT :
-							editColumnOrNextPossible(nextColumn(editorColumn));
-							e.detail= SWT.TRAVERSE_NONE;
-							break;
-
-						case SWT.TRAVERSE_TAB_PREVIOUS :
-							editColumnOrPrevPossible(prevColumn(editorColumn));
-							e.detail= SWT.TRAVERSE_NONE;
-							break;
-
-						default :
-							break;
-					}
+			editor.getText().addTraverseListener(e -> {
+				switch (e.detail) {
+					case SWT.TRAVERSE_TAB_NEXT :
+						editColumnOrNextPossible(nextColumn(editorColumn));
+						e.detail= SWT.TRAVERSE_NONE;
+						break;
+
+					case SWT.TRAVERSE_TAB_PREVIOUS :
+						editColumnOrPrevPossible(prevColumn(editorColumn));
+						e.detail= SWT.TRAVERSE_NONE;
+						break;
+
+					default :
+						break;
 				}
 			});
 			TextFieldNavigationHandler.install(editor.getText());
 		}
 
-		editors[NEWNAME_PROP].setActivationListener(new TableTextCellEditor.IActivationListener(){
-			@Override
-			public void activate() {
-				ParameterInfo[] selected= getSelectedElements();
-				if (selected.length == 1 && fNameContentAssistHandler != null) {
-					fNameContentAssistHandler.setEnabled(selected[0].isAdded());
-				}
+		editors[NEWNAME_PROP].setActivationListener(() -> {
+			ParameterInfo[] selected= getSelectedElements();
+			if (selected.length == 1 && fNameContentAssistHandler != null) {
+				fNameContentAssistHandler.setEnabled(selected[0].isAdded());
 			}
 		});
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
index 33b45012d8..2927a44196 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureWizard.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -223,12 +221,9 @@ public class ChangeSignatureWizard extends RefactoringWizard {
 			TextFieldNavigationHandler.install(text);
 
 			if (getChangeMethodSignatureProcessor().canChangeNameAndReturnType()) {
-				text.addModifyListener(new ModifyListener(){
-					@Override
-					public void modifyText(ModifyEvent e) {
-						getChangeMethodSignatureProcessor().setNewReturnTypeName(text.getText());
-						update(true);
-					}
+				text.addModifyListener(e -> {
+					getChangeMethodSignatureProcessor().setNewReturnTypeName(text.getText());
+					update(true);
 				});
 			} else {
 				text.setEnabled(false);
@@ -257,12 +252,9 @@ public class ChangeSignatureWizard extends RefactoringWizard {
 			TextFieldNavigationHandler.install(text);
 
 			if (getChangeMethodSignatureProcessor().canChangeNameAndReturnType()) {
-				text.addModifyListener(new ModifyListener(){
-					@Override
-					public void modifyText(ModifyEvent e) {
-						getChangeMethodSignatureProcessor().setNewMethodName(text.getText());
-						update(true);
-					}
+				text.addModifyListener(e -> {
+					getChangeMethodSignatureProcessor().setNewMethodName(text.getText());
+					update(true);
 				});
 			} else {
 				text.setEnabled(false);
@@ -317,12 +309,7 @@ public class ChangeSignatureWizard extends RefactoringWizard {
 			Composite border= new Composite(parent, SWT.NONE);
 			border.setLayout(new GridLayout());
 
-			ChangeExceptionsControl cp= new ChangeExceptionsControl(border, SWT.NONE, new IExceptionListChangeListener() {
-				@Override
-				public void exceptionListChanged() {
-					update(true);
-				}
-			}, getChangeMethodSignatureProcessor().getMethod().getJavaProject());
+			ChangeExceptionsControl cp= new ChangeExceptionsControl(border, SWT.NONE, () -> update(true), getChangeMethodSignatureProcessor().getMethod().getJavaProject());
 			cp.setLayoutData(new GridData(GridData.FILL_BOTH));
 			cp.setInput(getChangeMethodSignatureProcessor().getExceptionInfos());
 			return border;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeContentProvider.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeContentProvider.java
index d2f4d0f3b0..8b7768cd19 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeContentProvider.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeContentProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -42,13 +41,10 @@ class ChangeTypeContentProvider implements ITreeContentProvider {
 			return ((RootType)element).getChildren();
 		}
 		ITypeBinding[] superTypes = CollectionsUtil.toArray(getDirectSuperTypes((ITypeBinding)element), ITypeBinding.class);
-		Arrays.sort(superTypes, new Comparator<ITypeBinding>(){
-			@Override
-			public int compare(ITypeBinding o1, ITypeBinding o2) {
-				String name1 = o1.getQualifiedName();
-				String name2 = o2.getQualifiedName();
-				return name1.compareTo(name2);
-			}
+		Arrays.sort(superTypes, (o1, o2) -> {
+			String name1 = o1.getQualifiedName();
+			String name2 = o2.getQualifiedName();
+			return name1.compareTo(name2);
 		});
 		return superTypes;
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
index 037084b5e5..0e80f8846c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeTypeWizard.java
@@ -30,7 +30,6 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.jface.dialogs.Dialog;
@@ -39,7 +38,6 @@ import org.eclipse.jface.viewers.IColorProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.wizard.IWizardPage;
 
@@ -193,19 +191,16 @@ public class ChangeTypeWizard extends RefactoringWizard {
 			private Collection<ITypeBinding> fValidTypes;
 			@Override
 			public void run() {
-				IRunnableWithProgress runnable= new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor pm) {
-						pm.beginTask(RefactoringMessages.ChangeTypeWizard_analyzing, 1000);
-						ChangeTypeRefactoring ct= (ChangeTypeRefactoring)ChangeTypeWizard.this.getRefactoring();
-						fInvalidTypes = new HashSet<>();
-						fInvalidTypes.addAll(fCT.getAllSuperTypes(ct.getOriginalType()));
-						fValidTypes= ct.computeValidTypes(new SubProgressMonitor(pm, 950));
-						fInvalidTypes.add(ct.getOriginalType());
-						fInvalidTypes.removeAll(fValidTypes);
-						pm.worked(50);
-						pm.done();
-					}
+				IRunnableWithProgress runnable= pm -> {
+					pm.beginTask(RefactoringMessages.ChangeTypeWizard_analyzing, 1000);
+					ChangeTypeRefactoring ct= (ChangeTypeRefactoring)ChangeTypeWizard.this.getRefactoring();
+					fInvalidTypes = new HashSet<>();
+					fInvalidTypes.addAll(fCT.getAllSuperTypes(ct.getOriginalType()));
+					fValidTypes= ct.computeValidTypes(new SubProgressMonitor(pm, 950));
+					fInvalidTypes.add(ct.getOriginalType());
+					fInvalidTypes.removeAll(fValidTypes);
+					pm.worked(50);
+					pm.done();
 				};
 				boolean internalError= false;
 				try {
@@ -298,12 +293,9 @@ public class ChangeTypeWizard extends RefactoringWizard {
 			fTreeViewer.setContentProvider(new ChangeTypeContentProvider(((ChangeTypeRefactoring)getRefactoring())));
 			fLabelProvider= new ChangeTypeLabelProvider();
 			fTreeViewer.setLabelProvider(fLabelProvider);
-			ISelectionChangedListener listener= new ISelectionChangedListener(){
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					IStructuredSelection selection= (IStructuredSelection)event.getSelection();
-					typeSelected((ITypeBinding)selection.getFirstElement());
-				}
+			ISelectionChangedListener listener= event -> {
+				IStructuredSelection selection= (IStructuredSelection)event.getSelection();
+				typeSelected((ITypeBinding)selection.getFirstElement());
 			};
 			fTreeViewer.addSelectionChangedListener(listener);
 			fTreeViewer.setInput(new ChangeTypeContentProvider.RootType(getGeneralizeTypeRefactoring().getOriginalType()));
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedWizard.java
index 31959f4501..f638b67ec4 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedWizard.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -143,12 +141,9 @@ public class ConvertAnonymousToNestedWizard extends RefactoringWizard {
 
 			final Text classNameField= new Text(result, SWT.BORDER | SWT.SINGLE);
 			classNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			classNameField.addModifyListener(new ModifyListener(){
-				@Override
-				public void modifyText(ModifyEvent e) {
-					ConvertAnonymousToNestedInputPage.this.getConvertRefactoring().setClassName(classNameField.getText());
-					ConvertAnonymousToNestedInputPage.this.updateStatus();
-				}
+			classNameField.addModifyListener(e -> {
+				ConvertAnonymousToNestedInputPage.this.getConvertRefactoring().setClassName(classNameField.getText());
+				ConvertAnonymousToNestedInputPage.this.updateStatus();
 			});
 			TextFieldNavigationHandler.install(classNameField);
 			return classNameField;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CreateTextFileChangePreviewViewer.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CreateTextFileChangePreviewViewer.java
index 78553a8e88..f1cdcbdd38 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CreateTextFileChangePreviewViewer.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/CreateTextFileChangePreviewViewer.java
@@ -18,8 +18,6 @@ import java.util.Map;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
-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.graphics.RGB;
@@ -76,12 +74,7 @@ public final class CreateTextFileChangePreviewViewer implements IChangePreviewVi
 
 		public CreateTextFilePreviewer(Composite parent, int style) {
 			super(parent, style);
-			addDisposeListener(new DisposeListener() {
-				@Override
-				public void widgetDisposed(DisposeEvent e) {
-					disposeImage();
-				}
-			});
+			addDisposeListener(e -> disposeImage());
 		}
 
 		/*package*/ void disposeImage() {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java
index 02f9d586af..2955cf569f 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractClassWizard.java
@@ -15,8 +15,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -32,7 +30,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.fieldassist.ControlDecoration;
@@ -40,16 +37,12 @@ import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.ViewerCell;
@@ -179,14 +172,9 @@ public class ExtractClassWizard extends RefactoringWizard {
 			text.setText(fDescriptor.getClassName());
 			text.selectAll();
 			text.setFocus();
-			text.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					fDescriptor.setClassName(text.getText());
-					validateRefactoring();
-				}
-
+			text.addModifyListener(e -> {
+				fDescriptor.setClassName(text.getText());
+				validateRefactoring();
 			});
 			GridData gridData= new GridData(GridData.FILL_HORIZONTAL);
 			gridData.horizontalIndent= FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
@@ -226,14 +214,9 @@ public class ExtractClassWizard extends RefactoringWizard {
 			final Text text= new Text(group, SWT.BORDER);
 			fParameterNameDecoration= new ControlDecoration(text, SWT.TOP | SWT.LEAD);
 			text.setText(fDescriptor.getFieldName());
-			text.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					fDescriptor.setFieldName(text.getText());
-					validateRefactoring();
-				}
-
+			text.addModifyListener(e -> {
+				fDescriptor.setFieldName(text.getText());
+				validateRefactoring();
 			});
 			GridData gridData= new GridData(GridData.FILL_HORIZONTAL);
 			gridData.horizontalIndent= FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
@@ -303,16 +286,11 @@ public class ExtractClassWizard extends RefactoringWizard {
 						Field selected= (Field) ss.getFirstElement();
 						String message= RefactoringMessages.ExtractClassWizard_dialog_message;
 						String title= RefactoringMessages.ExtractClassWizard_dialog_title;
-						InputDialog inputDialog= new InputDialog(getShell(), title, message, selected.getNewFieldName(), new IInputValidator() {
-
-							@Override
-							public String isValid(String newText) {
-								IStatus status= JavaConventionsUtil.validateIdentifier(newText, fDescriptor.getType());
-								if (!status.isOK())
-									return status.getMessage();
-								return null;
-							}
-
+						InputDialog inputDialog= new InputDialog(getShell(), title, message, selected.getNewFieldName(), newText -> {
+							IStatus status= JavaConventionsUtil.validateIdentifier(newText, fDescriptor.getType());
+							if (!status.isOK())
+								return status.getMessage();
+							return null;
 						});
 						if (inputDialog.open() == Window.OK) {
 							selected.setNewFieldName(inputDialog.getValue());
@@ -322,26 +300,19 @@ public class ExtractClassWizard extends RefactoringWizard {
 					}
 				}
 			});
-			tv.addCheckStateListener(new ICheckStateListener() {
-				@Override
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					Field element= (Field) event.getElement();
-					element.setCreateField(event.getChecked());
-					validateRefactoring();
-					tv.refresh(element, true);
-				}
-
+			tv.addCheckStateListener(event -> {
+				Field element= (Field) event.getElement();
+				element.setCreateField(event.getChecked());
+				validateRefactoring();
+				tv.refresh(element, true);
 			});
-			tv.addSelectionChangedListener(new ISelectionChangedListener() {
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					IStructuredSelection selection= (IStructuredSelection) tv.getSelection();
-					Field field= (Field) selection.getFirstElement();
-					if (selection.isEmpty()) {
-						editButton.setEnabled(false);
-					} else {
-						editButton.setEnabled(tv.getChecked(field));
-					}
+			tv.addSelectionChangedListener(event -> {
+				IStructuredSelection selection= (IStructuredSelection) tv.getSelection();
+				Field field= (Field) selection.getFirstElement();
+				if (selection.isEmpty()) {
+					editButton.setEnabled(false);
+				} else {
+					editButton.setEnabled(tv.getChecked(field));
 				}
 			});
 		}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java
index bfaee05877..9c059c60ee 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceWizard.java
@@ -30,9 +30,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-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.wizard.IWizardPage;
 
@@ -209,12 +207,7 @@ public class ExtractInterfaceWizard extends RefactoringWizard {
 				ExceptionHandler.handle(e, RefactoringMessages.ExtractInterfaceInputPage_Extract_Interface, RefactoringMessages.ExtractInterfaceInputPage_Internal_Error);
 				fTableViewer.setInput(new IMember[0]);
 			}
-			fTableViewer.addCheckStateListener(new ICheckStateListener(){
-				@Override
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					ExtractInterfaceInputPage.this.updateUIElementEnablement();
-				}
-			});
+			fTableViewer.addCheckStateListener(event -> ExtractInterfaceInputPage.this.updateUIElementEnablement());
 			fTableViewer.setComparator(new JavaElementComparator());
 			fTableViewer.getControl().setEnabled(anyMembersToExtract());
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
index c3ef4cbb74..94b2b4122f 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMemberPage.java
@@ -21,8 +21,6 @@ import java.util.LinkedList;
 import java.util.Set;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -36,19 +34,13 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -116,18 +108,10 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage {
 			fViewer.setLabelProvider(createLabelProvider());
 			fViewer.setContentProvider(ArrayContentProvider.getInstance());
 			fViewer.setComparator(new SupertypeSelectionViewerSorter());
-			fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-				@Override
-				public void selectionChanged(final SelectionChangedEvent event) {
-					performSelectionChanged(((IStructuredSelection) fViewer.getSelection()).toArray());
-				}
-			});
-			fViewer.addDoubleClickListener(new IDoubleClickListener() {
-				@Override
-				public void doubleClick(final DoubleClickEvent event) {
-					performSelectionChanged(((IStructuredSelection) fViewer.getSelection()).toArray());
-					close();
-				}
+			fViewer.addSelectionChangedListener(event -> performSelectionChanged(((IStructuredSelection) fViewer.getSelection()).toArray()));
+			fViewer.addDoubleClickListener(event -> {
+				performSelectionChanged(((IStructuredSelection) fViewer.getSelection()).toArray());
+				close();
 			});
 			final GridData data= new GridData(GridData.FILL_BOTH);
 			data.heightHint= convertHeightInCharsToPixels(15);
@@ -252,15 +236,11 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage {
 		if (fCandidateTypes != null && fCandidateTypes.length > 0)
 			return;
 		try {
-			getWizard().getContainer().run(true, true, new IRunnableWithProgress() {
-
-				@Override
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException {
-					try {
-						fCandidateTypes= getProcessor().getCandidateTypes(new RefactoringStatus(), monitor);
-					} finally {
-						monitor.done();
-					}
+			getWizard().getContainer().run(true, true, monitor -> {
+				try {
+					fCandidateTypes= getProcessor().getCandidateTypes(new RefactoringStatus(), monitor);
+				} finally {
+					monitor.done();
 				}
 			});
 		} catch (InvocationTargetException exception) {
@@ -347,23 +327,19 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage {
 				}
 			}
 		});
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				final IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
-				if (selection.isEmpty()) {
+		fTableViewer.addSelectionChangedListener(event -> {
+			final IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
+			if (selection.isEmpty()) {
+				removeButton.setEnabled(false);
+				return;
+			} else {
+				final Object[] elements= selection.toArray();
+				if (elements.length == 1 && elements[0].equals(getDeclaringType())) {
 					removeButton.setEnabled(false);
 					return;
-				} else {
-					final Object[] elements= selection.toArray();
-					if (elements.length == 1 && elements[0].equals(getDeclaringType())) {
-						removeButton.setEnabled(false);
-						return;
-					}
 				}
-				removeButton.setEnabled(true);
 			}
+			removeButton.setEnabled(true);
 		});
 	}
 
@@ -412,13 +388,7 @@ public final class ExtractSupertypeMemberPage extends PullUpMemberPage {
 		label.setLayoutData(new GridData());
 
 		fNameField= new Text(parent, SWT.BORDER);
-		fNameField.addModifyListener(new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				handleNameChanged(fNameField.getText());
-			}
-		});
+		fNameField.addModifyListener(e -> handleNameChanged(fNameField.getText()));
 		fNameField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		TextFieldNavigationHandler.install(fNameField);
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMethodPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMethodPage.java
index e6bb9a6c6c..82ce39f955 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMethodPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractSupertypeMethodPage.java
@@ -17,10 +17,6 @@ import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.swt.widgets.Composite;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
 import org.eclipse.ui.PlatformUI;
 
 import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractSupertypeProcessor;
@@ -61,13 +57,7 @@ public class ExtractSupertypeMethodPage extends PullUpMethodPage {
 			final ExtractSupertypeProcessor processor= getProcessor();
 			processor.resetChanges();
 			try {
-				getWizard().getContainer().run(false, false, new IRunnableWithProgress() {
-
-					@Override
-					public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						processor.createWorkingCopyLayer(monitor);
-					}
-				});
+				getWizard().getContainer().run(false, false, monitor -> processor.createWorkingCopyLayer(monitor));
 			} catch (InvocationTargetException exception) {
 				JavaPlugin.log(exception);
 			} catch (InterruptedException exception) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceFactoryInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceFactoryInputPage.java
index 9237bcebba..c657a1649e 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceFactoryInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceFactoryInputPage.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -120,24 +118,21 @@ public class IntroduceFactoryInputPage extends UserInputWizardPage {
 		gd.horizontalSpan= 2;
 		protectCtorCB.setLayoutData(gd);
 
-		fMethodName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				fMethodNameStatus = getUseFactoryRefactoring().setNewMethodName(fMethodName.getText());
-				validateInput(true);
-				/*
-				boolean				nameOk= status.isOK();
-
-				if (status.hasFatalError()) {
-					IntroduceFactoryInputPage.this.setPageComplete(false);
-
-				}
-				IntroduceFactoryInputPage.this.setPageComplete(!status.hasFatalError());
-				IntroduceFactoryInputPage.this.setErrorMessage(nameOk ?
-					"" : //$NON-NLS-1$
-					status.getMessageMatchingSeverity(RefactoringStatus.ERROR));
-					*/
+		fMethodName.addModifyListener(e -> {
+			fMethodNameStatus = getUseFactoryRefactoring().setNewMethodName(fMethodName.getText());
+			validateInput(true);
+			/*
+			boolean				nameOk= status.isOK();
+
+			if (status.hasFatalError()) {
+				IntroduceFactoryInputPage.this.setPageComplete(false);
+
 			}
+			IntroduceFactoryInputPage.this.setPageComplete(!status.hasFatalError());
+			IntroduceFactoryInputPage.this.setErrorMessage(nameOk ?
+				"" : //$NON-NLS-1$
+				status.getMessageMatchingSeverity(RefactoringStatus.ERROR));
+				*/
 		});
 		protectCtorCB.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -148,19 +143,16 @@ public class IntroduceFactoryInputPage extends UserInputWizardPage {
 			}
 		});
 
-		factoryTypeName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				fDestinationStatus= getUseFactoryRefactoring().setFactoryClass(factoryTypeName.getText());
-				validateInput(false);
-				/*
-				boolean	nameOk= status.isOK();
+		factoryTypeName.addModifyListener(e -> {
+			fDestinationStatus= getUseFactoryRefactoring().setFactoryClass(factoryTypeName.getText());
+			validateInput(false);
+			/*
+			boolean	nameOk= status.isOK();
 
-				IntroduceFactoryInputPage.this.setPageComplete(nameOk);
-				IntroduceFactoryInputPage.this.setErrorMessage(nameOk ? "" : //$NON-NLS-1$
-															   status.getMessageMatchingSeverity(RefactoringStatus.ERROR));
-															   */
-			}
+			IntroduceFactoryInputPage.this.setPageComplete(nameOk);
+			IntroduceFactoryInputPage.this.setErrorMessage(nameOk ? "" : //$NON-NLS-1$
+														   status.getMessageMatchingSeverity(RefactoringStatus.ERROR));
+														   */
 		});
 		browseTypes.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceIndirectionInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceIndirectionInputPage.java
index 710e44f3b1..348865811e 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceIndirectionInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceIndirectionInputPage.java
@@ -17,8 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -145,12 +143,7 @@ public class IntroduceIndirectionInputPage extends UserInputWizardPage {
 		fIntermediaryMethodName.setText(getIntroduceIndirectionRefactoring().getIntermediaryMethodName());
 		fIntermediaryTypeName.setText(getIntroduceIndirectionRefactoring().getIntermediaryTypeName());
 
-		fIntermediaryMethodName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validateInput();
-			}
-		});
+		fIntermediaryMethodName.addModifyListener(e -> validateInput());
 
 		enableReferencesCheckBox.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -159,12 +152,7 @@ public class IntroduceIndirectionInputPage extends UserInputWizardPage {
 			}
 		});
 
-		fIntermediaryTypeName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validateInput();
-			}
-		});
+		fIntermediaryTypeName.addModifyListener(e -> validateInput());
 
 		browseTypes.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
index 4b2e3b79a3..dce800a277 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterObjectWizard.java
@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -37,7 +35,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.layout.TableColumnLayout;
@@ -50,10 +47,8 @@ import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
@@ -228,15 +223,10 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard {
 			l.setText(RefactoringMessages.IntroduceParameterObjectWizard_parameterfield_label);
 			final Text text= new Text(group, SWT.BORDER);
 			text.setText(fProcessor.getParameterName());
-			text.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					fProcessor.setParameterName(text.getText());
-					updateSignaturePreview();
-					validateRefactoring();
-				}
-
+			text.addModifyListener(e -> {
+				fProcessor.setParameterName(text.getText());
+				updateSignaturePreview();
+				validateRefactoring();
 			});
 			text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		}
@@ -484,16 +474,11 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard {
 						ParameterInfo selected= (ParameterInfo) ss.getFirstElement();
 						String message= RefactoringMessages.IntroduceParameterObjectWizard_fieldname_message;
 						String title= RefactoringMessages.IntroduceParameterObjectWizard_fieldname_title;
-						InputDialog inputDialog= new InputDialog(getShell(), title, message, selected.getNewName(), new IInputValidator() {
-
-							@Override
-							public String isValid(String newText) {
-								IStatus status= JavaConventionsUtil.validateIdentifier(newText, fProcessor.getCompilationUnit());
-								if (!status.isOK())
-									return status.getMessage();
-								return null;
-							}
-
+						InputDialog inputDialog= new InputDialog(getShell(), title, message, selected.getNewName(), newText -> {
+							IStatus status= JavaConventionsUtil.validateIdentifier(newText, fProcessor.getCompilationUnit());
+							if (!status.isOK())
+								return status.getMessage();
+							return null;
 						});
 						if (inputDialog.open() == Window.OK) {
 							selected.setNewName(inputDialog.getValue());
@@ -556,12 +541,7 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard {
 				}
 
 			});
-			tv.addSelectionChangedListener(new ISelectionChangedListener() {
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					updateButtons(tv, upButton, downButton, editButton);
-				}
-			});
+			tv.addSelectionChangedListener(event -> updateButtons(tv, upButton, downButton, editButton));
 		}
 
 		private void addSpacer(Composite parent) {
@@ -663,15 +643,10 @@ public class IntroduceParameterObjectWizard extends RefactoringWizard {
 			text.setText(fProcessor.getClassName());
 			text.selectAll();
 			text.setFocus();
-			text.addModifyListener(new ModifyListener() {
-
-				@Override
-				public void modifyText(ModifyEvent e) {
-					fProcessor.setClassName(text.getText());
-					updateSignaturePreview();
-					validateRefactoring();
-				}
-
+			text.addModifyListener(e -> {
+				fProcessor.setClassName(text.getText());
+				updateSignaturePreview();
+				validateRefactoring();
 			});
 			text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterWizard.java
index dbf9c45c18..e18dda5e53 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/IntroduceParameterWizard.java
@@ -145,12 +145,7 @@ public class IntroduceParameterWizard extends RefactoringWizard {
 			 * The asyncExec is a workaround for bug 450286:
 			 * Only set/reveal the table selection after the shell has been opened and laid out.
 			 */
-			composite.getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					cp.editParameter(getIntroduceParameterRefactoring().getAddedParameterInfo());
-				}
-			});
+			composite.getDisplay().asyncExec(() -> cp.editParameter(getIntroduceParameterRefactoring().getAddedParameterInfo()));
 			return cp;
 		}
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToTopWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToTopWizard.java
index a2b82756f3..12ba6edaed 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToTopWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToTopWizard.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -84,23 +82,19 @@ public class MoveInnerToTopWizard extends RefactoringWizard {
 					getMoveRefactoring().setMarkInstanceFieldAsFinal(fFinalCheckBox.getSelection());
 				}
 			});
-			fFieldNameEntryText.addModifyListener(new ModifyListener() {
-
-				@Override
-				public final void modifyText(ModifyEvent event) {
-					final String text= fFieldNameEntryText.getText();
-					final MoveInnerToTopRefactoring refactoring= getMoveRefactoring();
-					if (refactoring.isCreatingInstanceFieldMandatory())
-						setPageComplete(validateTextField(text));
-					final boolean empty= text.length() == 0;
-					if (refactoring.isCreatingInstanceFieldMandatory()) {
-						// Do nothing
-					} else if (refactoring.isCreatingInstanceFieldPossible()) {
-						fFinalCheckBox.setEnabled(!empty);
-					}
-					if (!refactoring.isCreatingInstanceFieldMandatory())
-						refactoring.setCreateInstanceField(!empty);
+			fFieldNameEntryText.addModifyListener(event -> {
+				final String text= fFieldNameEntryText.getText();
+				final MoveInnerToTopRefactoring refactoring= getMoveRefactoring();
+				if (refactoring.isCreatingInstanceFieldMandatory())
+					setPageComplete(validateTextField(text));
+				final boolean empty= text.length() == 0;
+				if (refactoring.isCreatingInstanceFieldMandatory()) {
+					// Do nothing
+				} else if (refactoring.isCreatingInstanceFieldPossible()) {
+					fFinalCheckBox.setEnabled(!empty);
 				}
+				if (!refactoring.isCreatingInstanceFieldMandatory())
+					refactoring.setCreateInstanceField(!empty);
 			});
 		}
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java
index fbe4618136..429e68cab3 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodWizard.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
@@ -34,10 +32,8 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 
@@ -155,27 +151,23 @@ public final class MoveInstanceMethodWizard extends RefactoringWizard {
 			final IVariableBinding[] possibleTargets= fProcessor.getPossibleTargets();
 			viewer.setSelection(new StructuredSelection(new Object[] { possibleTargets[0]}));
 
-			viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-				@Override
-				public final void selectionChanged(final SelectionChangedEvent event) {
-					final Object element= ((IStructuredSelection) event.getSelection()).getFirstElement();
-					if (element instanceof IVariableBinding) {
-						final IVariableBinding target= (IVariableBinding) element;
-						boolean success= false;
-						for (IVariableBinding v : fProcessor.getPossibleTargets()) {
-							if (Bindings.equals(target, v)) {
-								handleTargetChanged(target);
-								success= true;
-								break;
-							}
+			viewer.addSelectionChangedListener(event -> {
+				final Object element= ((IStructuredSelection) event.getSelection()).getFirstElement();
+				if (element instanceof IVariableBinding) {
+					final IVariableBinding target= (IVariableBinding) element;
+					boolean success= false;
+					for (IVariableBinding v : fProcessor.getPossibleTargets()) {
+						if (Bindings.equals(target, v)) {
+							handleTargetChanged(target);
+							success= true;
+							break;
 						}
-						if (!success)
-							fTargetTypeStatus= RefactoringStatus.createWarningStatus(Messages.format(RefactoringMessages.MoveInstanceMethodPage_invalid_target, BasicElementLabels.getJavaElementName(target.getName())));
-						else
-							fTargetTypeStatus= new RefactoringStatus();
-						handleStatusChanged();
 					}
+					if (!success)
+						fTargetTypeStatus= RefactoringStatus.createWarningStatus(Messages.format(RefactoringMessages.MoveInstanceMethodPage_invalid_target, BasicElementLabels.getJavaElementName(target.getName())));
+					else
+						fTargetTypeStatus= new RefactoringStatus();
+					handleStatusChanged();
 				}
 			});
 
@@ -194,13 +186,9 @@ public final class MoveInstanceMethodWizard extends RefactoringWizard {
 			fMethodNameField.selectAll();
 			fMethodNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 			fMethodNameField.setFocus();
-			fMethodNameField.addModifyListener(new ModifyListener() {
-
-				@Override
-				public final void modifyText(final ModifyEvent event) {
-					fMethodNameStatus= fProcessor.setMethodName(fMethodNameField.getText());
-					handleStatusChanged();
-				}
+			fMethodNameField.addModifyListener(event -> {
+				fMethodNameStatus= fProcessor.setMethodName(fMethodNameField.getText());
+				handleStatusChanged();
 			});
 			TextFieldNavigationHandler.install(fMethodNameField);
 
@@ -217,13 +205,9 @@ public final class MoveInstanceMethodWizard extends RefactoringWizard {
 				setPageComplete(false);
 			}
 			fTargetNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			fTargetNameField.addModifyListener(new ModifyListener() {
-
-				@Override
-				public final void modifyText(final ModifyEvent event) {
-					fTargetNameStatus= fProcessor.setTargetName(fTargetNameField.getText());
-					handleStatusChanged();
-				}
+			fTargetNameField.addModifyListener(event -> {
+				fTargetNameStatus= fProcessor.setTargetName(fTargetNameField.getText());
+				handleStatusChanged();
 			});
 			TextFieldNavigationHandler.install(fTargetNameField);
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java
index e00f380d31..7704a4159a 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersWizard.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.IWizardPage;
 
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 
 import org.eclipse.ltk.core.refactoring.Refactoring;
 import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
@@ -284,18 +283,15 @@ public class MoveMembersWizard extends RefactoringWizard {
 				getWizard().getContainer(), scope, elementKinds);
 			dialog.setTitle(RefactoringMessages.MoveMembersInputPage_choose_Type);
 			dialog.setMessage(RefactoringMessages.MoveMembersInputPage_dialogMessage);
-			dialog.setValidator(new ISelectionStatusValidator(){
-				@Override
-				public IStatus validate(Object[] selection) {
-					Assert.isTrue(selection.length <= 1);
-					if (selection.length == 0)
-						return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_Invalid_selection, null);
-					Object element= selection[0];
-					if (! (element instanceof IType))
-						return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_Invalid_selection, null);
-					IType type= (IType)element;
-					return validateDestinationType(type, type.getElementName());
-				}
+			dialog.setValidator(selection -> {
+				Assert.isTrue(selection.length <= 1);
+				if (selection.length == 0)
+					return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_Invalid_selection, null);
+				Object element= selection[0];
+				if (! (element instanceof IType))
+					return new Status(IStatus.ERROR, JavaPlugin.getPluginId(), IStatus.OK, RefactoringMessages.MoveMembersInputPage_Invalid_selection, null);
+				IType type= (IType)element;
+				return validateDestinationType(type, type.getElementName());
 			});
 			dialog.setInitialPattern(createInitialFilter());
 			if (dialog.open() == Window.CANCEL)
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java
index 560d778e60..2be46c1ea2 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -107,12 +105,7 @@ public class ParameterEditDialog extends StatusDialog {
 			fType.setLayoutData(gd);
 			fType.setText(fParameter.getNewTypeName());
 			fType.addModifyListener(
-				new ModifyListener() {
-					@Override
-					public void modifyText(ModifyEvent e) {
-						validate((Text)e.widget);
-					}
-				});
+				e -> validate((Text)e.widget));
 			TextFieldNavigationHandler.install(fType);
 			JavaTypeCompletionProcessor processor= new JavaTypeCompletionProcessor(true, false);
 			processor.setCompletionContext(fContext.getCuHandle(), fContext.getBeforeString(), fContext.getAfterString());
@@ -128,12 +121,7 @@ public class ParameterEditDialog extends StatusDialog {
 		fName.setLayoutData(gd);
 		fName.setText(newName);
 		fName.addModifyListener(
-			new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					validate((Text)e.widget);
-				}
-			});
+			e -> validate((Text)e.widget));
 		TextFieldNavigationHandler.install(fName);
 
 		if (fEditDefault && fParameter.isAdded()) {
@@ -144,12 +132,7 @@ public class ParameterEditDialog extends StatusDialog {
 			fDefaultValue.setLayoutData(gd);
 			fDefaultValue.setText(fParameter.getDefaultValue());
 			fDefaultValue.addModifyListener(
-				new ModifyListener() {
-					@Override
-					public void modifyText(ModifyEvent e) {
-						validate((Text)e.widget);
-					}
-				});
+				e -> validate((Text)e.widget));
 			TextFieldNavigationHandler.install(fDefaultValue);
 		}
 		applyDialogFont(result);
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java
index 46444786fb..ba88450f64 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempWizard.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -115,12 +113,9 @@ public class PromoteTempWizard extends RefactoringWizard {
 			getPromoteTempRefactoring().setFieldName(firstGuessedFieldName);
 			fNameField.selectAll();
 			fNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			fNameField.addModifyListener(new ModifyListener(){
-				@Override
-				public void modifyText(ModifyEvent e) {
-					PromoteTempInputPage.this.getPromoteTempRefactoring().setFieldName(fNameField.getText());
-					PromoteTempInputPage.this.updateStatus();
-				}
+			fNameField.addModifyListener(e -> {
+				PromoteTempInputPage.this.getPromoteTempRefactoring().setFieldName(fNameField.getText());
+				PromoteTempInputPage.this.updateStatus();
 			});
 			IContentAssistProcessor processor= new FieldNameProcessor(guessedFieldNames, getPromoteTempRefactoring());
 			ControlContentAssistHelper.createTextContentAssistant(fNameField, processor);
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
index 2a8377f194..44f8b968fe 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMemberPage.java
@@ -44,21 +44,15 @@ import org.eclipse.jface.layout.PixelConverter;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.window.Window;
@@ -570,33 +564,17 @@ public class PullUpMemberPage extends UserInputWizardPage {
 		fTableViewer.setUseHashlookup(true);
 		fTableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		fTableViewer.setLabelProvider(new MemberActionInfoLabelProvider());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				updateButtonEnablement(event.getSelection());
-			}
-		});
-		fTableViewer.addCheckStateListener(new ICheckStateListener() {
-
-			@Override
-			public void checkStateChanged(final CheckStateChangedEvent event) {
-				final boolean checked= event.getChecked();
-				final MemberActionInfo info= (MemberActionInfo) event.getElement();
-				if (checked)
-					info.setAction(PULL_UP_ACTION);
-				else
-					info.setAction(MemberActionInfo.NO_ACTION);
-				updateWizardPage(null, true);
-			}
-		});
-		fTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(final DoubleClickEvent event) {
-				editSelectedMembers();
-			}
+		fTableViewer.addSelectionChangedListener(event -> updateButtonEnablement(event.getSelection()));
+		fTableViewer.addCheckStateListener(event -> {
+			final boolean checked= event.getChecked();
+			final MemberActionInfo info= (MemberActionInfo) event.getElement();
+			if (checked)
+				info.setAction(PULL_UP_ACTION);
+			else
+				info.setAction(MemberActionInfo.NO_ACTION);
+			updateWizardPage(null, true);
 		});
+		fTableViewer.addDoubleClickListener(event -> editSelectedMembers());
 
 		setTableInput();
 		checkPullUp(fProcessor.getMembersToMove(), false);
@@ -689,16 +667,13 @@ public class PullUpMemberPage extends UserInputWizardPage {
 
 	protected void createSuperTypeControl(final Composite parent) {
 		try {
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, false, new IRunnableWithProgress() {
-				@Override
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException {
-					try {
-						fCandidateTypes= fProcessor.getCandidateTypes(new RefactoringStatus(), monitor);
-					} catch (JavaModelException exception) {
-						throw new InvocationTargetException(exception);
-					} finally {
-						monitor.done();
-					}
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, false, monitor -> {
+				try {
+					fCandidateTypes= fProcessor.getCandidateTypes(new RefactoringStatus(), monitor);
+				} catch (JavaModelException exception) {
+					throw new InvocationTargetException(exception);
+				} finally {
+					monitor.done();
 				}
 			});
 			createSuperTypeCombo(parent);
@@ -959,22 +934,18 @@ public class PullUpMemberPage extends UserInputWizardPage {
 		final ComboBoxCellEditor editor= new ComboBoxCellEditor();
 		editor.setStyle(SWT.READ_ONLY);
 		fTableViewer.setCellEditors(new CellEditor[] { null, editor});
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				if (editor.getControl() == null && !table.isDisposed())
-					editor.create(table);
-				final ISelection sel= event.getSelection();
-				if (!(sel instanceof IStructuredSelection))
-					return;
-				final IStructuredSelection structured= (IStructuredSelection) sel;
-				if (structured.size() != 1)
-					return;
-				final MemberActionInfo info= (MemberActionInfo) structured.getFirstElement();
-				editor.setItems(info.getAllowedLabels());
-				editor.setValue(Integer.valueOf(info.getAction()));
-			}
+		fTableViewer.addSelectionChangedListener(event -> {
+			if (editor.getControl() == null && !table.isDisposed())
+				editor.create(table);
+			final ISelection sel= event.getSelection();
+			if (!(sel instanceof IStructuredSelection))
+				return;
+			final IStructuredSelection structured= (IStructuredSelection) sel;
+			if (structured.size() != 1)
+				return;
+			final MemberActionInfo info= (MemberActionInfo) structured.getFirstElement();
+			editor.setItems(info.getAllowedLabels());
+			editor.setValue(Integer.valueOf(info.getAction()));
 		});
 
 		final ICellModifier cellModifier= new MemberActionCellModifier();
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
index b0d1b724c0..d07ff1a06a 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpMethodPage.java
@@ -38,13 +38,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -402,20 +398,8 @@ public class PullUpMethodPage extends UserInputWizardPage {
 		fTreeViewer.setLabelProvider(new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT | JavaElementLabelProvider.SHOW_SMALL_ICONS));
 		fTreeViewer.setUseHashlookup(true);
 		fTreeViewer.setComparator(new JavaElementComparator());
-		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				treeViewerSelectionChanged(event);
-			}
-		});
-		fTreeViewer.addCheckStateListener(new ICheckStateListener() {
-
-			@Override
-			public void checkStateChanged(final CheckStateChangedEvent event) {
-				updateSelectionLabel();
-			}
-		});
+		fTreeViewer.addSelectionChangedListener(event -> treeViewerSelectionChanged(event));
+		fTreeViewer.addCheckStateListener(event -> updateSelectionLabel());
 	}
 
 	private void createTypeHierarchyLabel(final Composite composite) {
@@ -472,15 +456,11 @@ public class PullUpMethodPage extends UserInputWizardPage {
 
 	private void initializeTreeViewer() {
 		try {
-			getContainer().run(false, false, new IRunnableWithProgress() {
-
-				@Override
-				public void run(final IProgressMonitor pm) {
-					try {
-						initializeTreeViewer(pm);
-					} finally {
-						pm.done();
-					}
+			getContainer().run(false, false, pm -> {
+				try {
+					initializeTreeViewer(pm);
+				} finally {
+					pm.done();
 				}
 			});
 		} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
index e7a87cc50d..c680ae4209 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownWizard.java
@@ -34,28 +34,20 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.layout.PixelConverter;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.window.Window;
@@ -365,33 +357,17 @@ public final class PushDownWizard extends RefactoringWizard {
 			fTableViewer.setUseHashlookup(true);
 			fTableViewer.setContentProvider(ArrayContentProvider.getInstance());
 			fTableViewer.setLabelProvider(new MemberActionInfoLabelProvider());
-			fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-				@Override
-				public void selectionChanged(final SelectionChangedEvent event) {
-					PushDownInputPage.this.updateButtonEnablementState((IStructuredSelection) event.getSelection());
-				}
-			});
-			fTableViewer.addCheckStateListener(new ICheckStateListener() {
-
-				@Override
-				public void checkStateChanged(final CheckStateChangedEvent event) {
-					final boolean checked= event.getChecked();
-					final MemberActionInfo info= (MemberActionInfo) event.getElement();
-					if (checked)
-						info.setAction(MemberActionInfo.PUSH_DOWN_ACTION);
-					else
-						info.setAction(MemberActionInfo.NO_ACTION);
-					updateWizardPage(null, true);
-				}
-			});
-			fTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-
-				@Override
-				public void doubleClick(final DoubleClickEvent event) {
-					PushDownInputPage.this.editSelectedMembers();
-				}
+			fTableViewer.addSelectionChangedListener(event -> PushDownInputPage.this.updateButtonEnablementState((IStructuredSelection) event.getSelection()));
+			fTableViewer.addCheckStateListener(event -> {
+				final boolean checked= event.getChecked();
+				final MemberActionInfo info= (MemberActionInfo) event.getElement();
+				if (checked)
+					info.setAction(MemberActionInfo.PUSH_DOWN_ACTION);
+				else
+					info.setAction(MemberActionInfo.NO_ACTION);
+				updateWizardPage(null, true);
 			});
+			fTableViewer.addDoubleClickListener(event -> PushDownInputPage.this.editSelectedMembers());
 
 			fTableViewer.setInput(fProcessor.getMemberActionInfos());
 			updateWizardPage(null, false);
@@ -524,18 +500,14 @@ public final class PushDownWizard extends RefactoringWizard {
 
 		public void markAdditionalRequiredMembersAsMembersToPushDown() {
 			try {
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(false, false, new IRunnableWithProgress() {
-
-					@Override
-					public void run(final IProgressMonitor pm) throws InvocationTargetException {
-						try {
-							fProcessor.computeAdditionalRequiredMembersToPushDown(pm);
-							updateWizardPage(null, true);
-						} catch (final JavaModelException e) {
-							throw new InvocationTargetException(e);
-						} finally {
-							pm.done();
-						}
+				PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(false, false, pm -> {
+					try {
+						fProcessor.computeAdditionalRequiredMembersToPushDown(pm);
+						updateWizardPage(null, true);
+					} catch (final JavaModelException e) {
+						throw new InvocationTargetException(e);
+					} finally {
+						pm.done();
 					}
 				});
 			} catch (final InvocationTargetException e) {
@@ -560,20 +532,16 @@ public final class PushDownWizard extends RefactoringWizard {
 			final ComboBoxCellEditor comboBoxCellEditor= new ComboBoxCellEditor();
 			comboBoxCellEditor.setStyle(SWT.READ_ONLY);
 			fTableViewer.setCellEditors(new CellEditor[] { null, comboBoxCellEditor});
-			fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-				@Override
-				public void selectionChanged(final SelectionChangedEvent event) {
-					if (comboBoxCellEditor.getControl() == null && !table.isDisposed())
-						comboBoxCellEditor.create(table);
-					Assert.isTrue(event.getSelection() instanceof IStructuredSelection);
-					final IStructuredSelection ss= (IStructuredSelection) event.getSelection();
-					if (ss.size() != 1)
-						return;
-					final MemberActionInfo mac= (MemberActionInfo) ss.getFirstElement();
-					comboBoxCellEditor.setItems(MemberActionInfoLabelProvider.getAvailableActionLabels(mac));
-					comboBoxCellEditor.setValue(Integer.valueOf(mac.getAction()));
-				}
+			fTableViewer.addSelectionChangedListener(event -> {
+				if (comboBoxCellEditor.getControl() == null && !table.isDisposed())
+					comboBoxCellEditor.create(table);
+				Assert.isTrue(event.getSelection() instanceof IStructuredSelection);
+				final IStructuredSelection ss= (IStructuredSelection) event.getSelection();
+				if (ss.size() != 1)
+					return;
+				final MemberActionInfo mac= (MemberActionInfo) ss.getFirstElement();
+				comboBoxCellEditor.setItems(MemberActionInfoLabelProvider.getAvailableActionLabels(mac));
+				comboBoxCellEditor.setValue(Integer.valueOf(mac.getAction()));
 			});
 
 			final ICellModifier cellModifier= new PushDownCellModifier();
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java
index 06cf274ce8..5d5f91250f 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/QualifiedNameComponent.java
@@ -14,8 +14,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -56,12 +54,7 @@ public class QualifiedNameComponent extends Composite {
 		fPatterns.setText(text);
 		refactoring.setFilePatterns(text);
 
-		fPatterns.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				refactoring.setFilePatterns(fPatterns.getText());
-			}
-		});
+		fPatterns.addModifyListener(e -> refactoring.setFilePatterns(fPatterns.getText()));
 	}
 
 	@Override
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringExecutionHelper.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringExecutionHelper.java
index ccd1302810..dc6f3196be 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringExecutionHelper.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringExecutionHelper.java
@@ -85,12 +85,7 @@ public class RefactoringExecutionHelper {
 				if (status.getSeverity() >= fStopSeverity) {
 					final boolean[] canceled= { false };
 					if (fForked) {
-						fParent.getDisplay().syncExec(new Runnable() {
-							@Override
-							public void run() {
-								canceled[0]= showStatusDialog(status);
-							}
-						});
+						fParent.getDisplay().syncExec(() -> canceled[0]= showStatusDialog(status));
 					} else {
 						canceled[0]= showStatusDialog(status);
 					}
@@ -177,12 +172,7 @@ public class RefactoringExecutionHelper {
 		}
 		try {
 			try {
-				Runnable r= new Runnable() {
-					@Override
-					public void run() {
-						manager.beginRule(rule, null);
-					}
-				};
+				Runnable r= () -> manager.beginRule(rule, null);
 				BusyIndicator.showWhile(fParent.getDisplay(), r);
 			} catch (OperationCanceledException e) {
 				throw new InterruptedException(e.getMessage());
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/TextInputWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/TextInputWizardPage.java
index 8faea47cb6..a267741625 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/TextInputWizardPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/TextInputWizardPage.java
@@ -15,8 +15,6 @@
 package org.eclipse.jdt.internal.ui.refactoring;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
@@ -136,12 +134,7 @@ public abstract class TextInputWizardPage extends UserInputWizardPage{
 
 	protected Text createTextInputField(Composite parent, int style) {
 		fTextField= new Text(parent, style);
-		fTextField.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				textModified(getText());
-			}
-		});
+		fTextField.addModifyListener(e -> textModified(getText()));
 		fTextField.setText(fInitialValue);
 		TextFieldNavigationHandler.install(fTextField);
 		return fTextField;
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
index 8db3f2d112..9b91aee460 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeWizard.java
@@ -33,10 +33,8 @@ import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
@@ -237,19 +235,16 @@ public class UseSupertypeWizard extends RefactoringWizard{
 					return getComparator().compare(type1.getElementName(), type2.getElementName());
 				}
 			});
-			fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					IStructuredSelection ss= (IStructuredSelection)event.getSelection();
-					if (Integer.valueOf(0).equals(fFileCount.get(ss.getFirstElement()))){
-						setMessage(RefactoringMessages.UseSupertypeInputPage_No_updates, IMessageProvider.INFORMATION);
-						setPageComplete(false);
-					} else {
-						setMessage(MESSAGE);
-						setPageComplete(true);
-					}
-					fTreeViewer.refresh();
+			fTreeViewer.addSelectionChangedListener(event -> {
+				IStructuredSelection ss= (IStructuredSelection)event.getSelection();
+				if (Integer.valueOf(0).equals(fFileCount.get(ss.getFirstElement()))){
+					setMessage(RefactoringMessages.UseSupertypeInputPage_No_updates, IMessageProvider.INFORMATION);
+					setPageComplete(false);
+				} else {
+					setMessage(MESSAGE);
+					setPageComplete(true);
 				}
+				fTreeViewer.refresh();
 			});
 			try {
 				fTreeViewer.setInput(SuperTypeHierarchyCache.getTypeHierarchy(getUseSupertypeProcessor().getSubType()));
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
index 64e57a6b4c..c6a29dee06 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java
@@ -16,8 +16,6 @@
 package org.eclipse.jdt.internal.ui.refactoring.code;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -300,12 +298,7 @@ public class ExtractMethodInputPage extends UserInputWizardPage {
 
 	private Text createTextInputField(Composite parent, int style) {
 		Text result= new Text(parent, style);
-		result.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				textModified(getText());
-			}
-		});
+		result.addModifyListener(e -> textModified(getText()));
 		TextFieldNavigationHandler.install(result);
 		return result;
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/ControlContentAssistHelper.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/ControlContentAssistHelper.java
index c8779c2220..c873324d95 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/ControlContentAssistHelper.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/contentassist/ControlContentAssistHelper.java
@@ -14,15 +14,12 @@
 package org.eclipse.jdt.internal.ui.refactoring.contentassist;
 
 import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.jface.contentassist.SubjectControlContentAssistant;
 
 import org.eclipse.jface.text.DefaultInformationControl;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
 
@@ -60,12 +57,7 @@ public class ControlContentAssistHelper {
 
 		ContentAssistPreference.configure(contentAssistant, JavaPlugin.getDefault().getPreferenceStore());
 		contentAssistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
-		contentAssistant.setInformationControlCreator(new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString());
-			}
-		});
+		contentAssistant.setInformationControlCreator(parent -> new DefaultInformationControl(parent, JavaPlugin.getAdditionalInfoAffordanceString()));
 
 		return contentAssistant;
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizard.java
index 43047e5db4..65047fb7f0 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizard.java
@@ -78,22 +78,19 @@ public class ExternalizeWizard extends RefactoringWizard {
 			return;
 		}
 		Display display= shell != null ? shell.getDisplay() : Display.getCurrent();
-		BusyIndicator.showWhile(display, new Runnable() {
-			@Override
-			public void run() {
-				NLSRefactoring refactoring= null;
-				try {
-					refactoring= NLSRefactoring.create(unit);
-				} catch (IllegalArgumentException e) {
-					// Loading a properties file can throw an IAE due to malformed Unicode escape sequence, see Properties#load for details.
-					IStatus status= new Status(IStatus.ERROR, JavaPlugin.getPluginId(), e.getLocalizedMessage());
-					ExceptionHandler.handle(status,
-							NLSUIMessages.ExternalizeWizard_name,
-							NLSUIMessages.ExternalizeWizard_error_message);
-				}
-				if (refactoring != null)
-					new RefactoringStarter().activate(new ExternalizeWizard(refactoring), shell, ActionMessages.ExternalizeStringsAction_dialog_title, RefactoringSaveHelper.SAVE_REFACTORING);
+		BusyIndicator.showWhile(display, () -> {
+			NLSRefactoring refactoring= null;
+			try {
+				refactoring= NLSRefactoring.create(unit);
+			} catch (IllegalArgumentException e) {
+				// Loading a properties file can throw an IAE due to malformed Unicode escape sequence, see Properties#load for details.
+				IStatus status= new Status(IStatus.ERROR, JavaPlugin.getPluginId(), e.getLocalizedMessage());
+				ExceptionHandler.handle(status,
+						NLSUIMessages.ExternalizeWizard_name,
+						NLSUIMessages.ExternalizeWizard_error_message);
 			}
+			if (refactoring != null)
+				new RefactoringStarter().activate(new ExternalizeWizard(refactoring), shell, ActionMessages.ExternalizeStringsAction_dialog_title, RefactoringSaveHelper.SAVE_REFACTORING);
 		});
 	}
 }
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
index 8aa09882bd..878fb7295f 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java
@@ -23,8 +23,6 @@ import java.util.Properties;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -70,7 +68,6 @@ import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.IFontProvider;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -767,12 +764,7 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 		fTableViewer.setLabelProvider(new NLSSubstitutionLabelProvider());
 		fTableViewer.setInput(fSubstitutions);
 
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				ExternalizeWizardPage.this.selectionChanged(event);
-			}
-		});
+		fTableViewer.addSelectionChangedListener(event -> ExternalizeWizardPage.this.selectionChanged(event));
 	}
 
 	private void createDefaultExternalization(NLSSubstitution[] substitutions) {
@@ -848,12 +840,9 @@ class ExternalizeWizardPage extends UserInputWizardPage {
 		fPrefixField.setText(fNLSRefactoring.getPrefix());
 		fPrefixField.selectAll();
 
-		fPrefixField.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				fNLSRefactoring.setPrefix(fPrefixField.getText());
-				validateKeys(true);
-			}
+		fPrefixField.addModifyListener(e -> {
+			fNLSRefactoring.setPrefix(fPrefixField.getText());
+			validateKeys(true);
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageFragmentSelection.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageFragmentSelection.java
index 870b9ee6c1..a33145ee1c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageFragmentSelection.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/PackageFragmentSelection.java
@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.ui.refactoring.nls;
 
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
@@ -54,12 +52,7 @@ class PackageFragmentSelection extends StringButtonStatusDialogField implements
 		Control[] res= super.doFillIntoGrid(parent, nColumns);
 
 		final Text text= getTextControl(null);
-		text.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				updateListener();
-			}
-		});
+		text.addModifyListener(e -> updateListener());
 		LayoutUtil.setWidthHint(text, textWidth);
 		LayoutUtil.setHorizontalGrabbing(text);
 		ControlContentAssistHelper.createTextContentAssistant(text, fCurrPackageCompletionProcessor);
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/NewNameQueries.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/NewNameQueries.java
index 78304e6d8c..7be0cabc8e 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/NewNameQueries.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/NewNameQueries.java
@@ -121,86 +121,72 @@ public class NewNameQueries implements INewNameQueries {
 
 	@Override
 	public INewNameQuery createStaticQuery(final String newName){
-		return new INewNameQuery(){
-			@Override
-			public String getNewName() {
-				return newName;
-			}
-		};
+		return () -> newName;
 	}
 
 	private static INewNameQuery createStaticQuery(final IInputValidator validator, final String message, final String initial, final boolean isFile, final Shell shell) {
-		return new INewNameQuery(){
-			@Override
-			public String getNewName() throws OperationCanceledException {
-				InputDialog dialog= new InputDialog(shell, ReorgMessages.ReorgQueries_nameConflictMessage, message, initial, validator) {
-					@Override
-					protected Control createDialogArea(Composite parent) {
-						Control area= super.createDialogArea(parent);
-						TextFieldNavigationHandler.install(getText());
-						return area;
-					}
+		return () -> {
+			InputDialog dialog= new InputDialog(shell, ReorgMessages.ReorgQueries_nameConflictMessage, message, initial, validator) {
+				@Override
+				protected Control createDialogArea(Composite parent) {
+					Control area= super.createDialogArea(parent);
+					TextFieldNavigationHandler.install(getText());
+					return area;
+				}
 
-					@Override
-					protected Control createContents(Composite parent) {
-						Control contents= super.createContents(parent);
-						int lastIndexOfDot= initial.lastIndexOf('.');
-						if (isFile && lastIndexOfDot > 0) {
-							getText().setSelection(0, lastIndexOfDot);
-						}
-						return contents;
+				@Override
+				protected Control createContents(Composite parent) {
+					Control contents= super.createContents(parent);
+					int lastIndexOfDot= initial.lastIndexOf('.');
+					if (isFile && lastIndexOfDot > 0) {
+						getText().setSelection(0, lastIndexOfDot);
 					}
-				};
-				if (dialog.open() == Window.CANCEL)
-					throw new OperationCanceledException();
-				return dialog.getValue();
-			}
+					return contents;
+				}
+			};
+			if (dialog.open() == Window.CANCEL)
+				throw new OperationCanceledException();
+			return dialog.getValue();
 		};
 	}
 
 	private static IInputValidator createResourceNameValidator(final IResource res){
-		IInputValidator validator= new IInputValidator(){
-			@Override
-			public String isValid(String newText) {
-				if (newText == null || "".equals(newText) || res.getParent() == null) //$NON-NLS-1$
-					return INVALID_NAME_NO_MESSAGE;
-				if (res.getParent().findMember(newText) != null)
-					return ReorgMessages.ReorgQueries_resourceWithThisNameAlreadyExists;
-				if (! res.getParent().getFullPath().isValidSegment(newText))
-					return ReorgMessages.ReorgQueries_invalidNameMessage;
-				IStatus status= res.getParent().getWorkspace().validateName(newText, res.getType());
-				if (status.getSeverity() == IStatus.ERROR)
-					return status.getMessage();
-
-				if (res.getName().equalsIgnoreCase(newText))
-					return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
-
-				return null;
-			}
+		IInputValidator validator= newText -> {
+			if (newText == null || "".equals(newText) || res.getParent() == null) //$NON-NLS-1$
+				return INVALID_NAME_NO_MESSAGE;
+			if (res.getParent().findMember(newText) != null)
+				return ReorgMessages.ReorgQueries_resourceWithThisNameAlreadyExists;
+			if (! res.getParent().getFullPath().isValidSegment(newText))
+				return ReorgMessages.ReorgQueries_invalidNameMessage;
+			IStatus status= res.getParent().getWorkspace().validateName(newText, res.getType());
+			if (status.getSeverity() == IStatus.ERROR)
+				return status.getMessage();
+
+			if (res.getName().equalsIgnoreCase(newText))
+				return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
+
+			return null;
 		};
 		return validator;
 	}
 
 	private static IInputValidator createCompilationUnitNameValidator(final ICompilationUnit cu) {
-		IInputValidator validator= new IInputValidator(){
-			@Override
-			public String isValid(String newText) {
-				if (newText == null || "".equals(newText)) //$NON-NLS-1$
-					return INVALID_NAME_NO_MESSAGE;
-				String newCuName= JavaModelUtil.getRenamedCUName(cu, newText);
-				IStatus status= JavaConventionsUtil.validateCompilationUnitName(newCuName, cu);
-				if (status.getSeverity() == IStatus.ERROR)
-					return status.getMessage();
-				RefactoringStatus refStatus;
-				refStatus= Checks.checkCompilationUnitNewName(cu, newText);
-				if (refStatus.hasFatalError())
-					return refStatus.getMessageMatchingSeverity(RefactoringStatus.FATAL);
-
-				if (cu.getElementName().equalsIgnoreCase(newCuName))
-					return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
-
-				return null;
-			}
+		IInputValidator validator= newText -> {
+			if (newText == null || "".equals(newText)) //$NON-NLS-1$
+				return INVALID_NAME_NO_MESSAGE;
+			String newCuName= JavaModelUtil.getRenamedCUName(cu, newText);
+			IStatus status= JavaConventionsUtil.validateCompilationUnitName(newCuName, cu);
+			if (status.getSeverity() == IStatus.ERROR)
+				return status.getMessage();
+			RefactoringStatus refStatus;
+			refStatus= Checks.checkCompilationUnitNewName(cu, newText);
+			if (refStatus.hasFatalError())
+				return refStatus.getMessageMatchingSeverity(RefactoringStatus.FATAL);
+
+			if (cu.getElementName().equalsIgnoreCase(newCuName))
+				return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
+
+			return null;
 		};
 		return validator;
 	}
@@ -217,29 +203,26 @@ public class NewNameQueries implements INewNameQueries {
 	}
 
 	private static IInputValidator createPackageNameValidator(final IPackageFragment pack) {
-		IInputValidator validator= new IInputValidator(){
-			@Override
-			public String isValid(String newText) {
-				if (newText == null || "".equals(newText)) //$NON-NLS-1$
-					return INVALID_NAME_NO_MESSAGE;
-				IStatus status= JavaConventionsUtil.validatePackageName(newText, pack);
-				if (status.getSeverity() == IStatus.ERROR)
-					return status.getMessage();
-
-				IJavaElement parent= pack.getParent();
-				try {
-					if (parent instanceof IPackageFragmentRoot){
-						if (! RenamePackageProcessor.isPackageNameOkInRoot(newText, (IPackageFragmentRoot)parent))
-							return ReorgMessages.ReorgQueries_packagewithThatNameexistsMassage;
-					}
-				} catch (CoreException e) {
-					return INVALID_NAME_NO_MESSAGE;
+		IInputValidator validator= newText -> {
+			if (newText == null || "".equals(newText)) //$NON-NLS-1$
+				return INVALID_NAME_NO_MESSAGE;
+			IStatus status= JavaConventionsUtil.validatePackageName(newText, pack);
+			if (status.getSeverity() == IStatus.ERROR)
+				return status.getMessage();
+
+			IJavaElement parent= pack.getParent();
+			try {
+				if (parent instanceof IPackageFragmentRoot){
+					if (! RenamePackageProcessor.isPackageNameOkInRoot(newText, (IPackageFragmentRoot)parent))
+						return ReorgMessages.ReorgQueries_packagewithThatNameexistsMassage;
 				}
-				if (pack.getElementName().equalsIgnoreCase(newText))
-					return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
-
-				return null;
+			} catch (CoreException e) {
+				return INVALID_NAME_NO_MESSAGE;
 			}
+			if (pack.getElementName().equalsIgnoreCase(newText))
+				return ReorgMessages.ReorgQueries_resourceExistsWithDifferentCaseMassage;
+
+			return null;
 		};
 		return validator;
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
index ac03fc583c..ff8a5c4e86 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/PasteAction.java
@@ -49,7 +49,6 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.IWorkspaceRunnable;
 
 import org.eclipse.core.filebuffers.ITextFileBuffer;
 
@@ -237,12 +236,7 @@ public class PasteAction extends SelectionDispatchAction{
 	private static Object getContents(final Clipboard clipboard, final Transfer transfer, Shell shell) {
 		//see bug 33028 for explanation why we need this
 		final Object[] result= new Object[1];
-		shell.getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				result[0]= clipboard.getContents(transfer);
-			}
-		});
+		shell.getDisplay().syncExec(() -> result[0]= clipboard.getContents(transfer));
 		return result[0];
 	}
 
@@ -706,33 +700,30 @@ public class PasteAction extends SelectionDispatchAction{
 
 					final ArrayList<ICompilationUnit> cus= new ArrayList<>();
 					try {
-						JavaCore.run(new IWorkspaceRunnable() {
-							@Override
-							public void run(IProgressMonitor pm) throws CoreException {
-								pm.beginTask("", 1 + fParsedCus.length); //$NON-NLS-1$
+						JavaCore.run(pm -> {
+							pm.beginTask("", 1 + fParsedCus.length); //$NON-NLS-1$
 
-								if (fDestination == null) {
-									fDestination= createNewProject(new SubProgressMonitor(pm, 1));
-								} else {
-									pm.worked(1);
-								}
-								IConfirmQuery confirmQuery= new ReorgQueries(getShell()).createYesYesToAllNoNoToAllQuery(ReorgMessages.PasteAction_TextPaster_confirmOverwriting, true, IReorgQueries.CONFIRM_OVERWRITING);
-								for (ParsedCu parsedCu : fParsedCus) {
-									if (pm.isCanceled())
-										break;
-									ICompilationUnit cu= pasteCU(parsedCu, new SubProgressMonitor(pm, 1), confirmQuery);
-									if (cu != null)
-										cus.add(cu);
-								}
+							if (fDestination == null) {
+								fDestination= createNewProject(new SubProgressMonitor(pm, 1));
+							} else {
+								pm.worked(1);
+							}
+							IConfirmQuery confirmQuery= new ReorgQueries(getShell()).createYesYesToAllNoNoToAllQuery(ReorgMessages.PasteAction_TextPaster_confirmOverwriting, true, IReorgQueries.CONFIRM_OVERWRITING);
+							for (ParsedCu parsedCu : fParsedCus) {
+								if (pm.isCanceled())
+									break;
+								ICompilationUnit cu= pasteCU(parsedCu, new SubProgressMonitor(pm, 1), confirmQuery);
+								if (cu != null)
+									cus.add(cu);
+							}
 
-								if (selectedWorkingSets.length == 1) {
-									IWorkingSet ws= selectedWorkingSets[0];
-									if (!IWorkingSetIDs.OTHERS.equals(ws.getId())) {
-										ArrayList<IAdaptable> newElements= new ArrayList<>();
-										newElements.addAll(Arrays.asList(ws.getElements()));
-										newElements.addAll(Arrays.asList(ws.adaptElements(new IAdaptable[] { fDestination.getJavaProject() })));
-										ws.setElements(newElements.toArray(new IAdaptable[newElements.size()]));
-									}
+							if (selectedWorkingSets.length == 1) {
+								IWorkingSet ws= selectedWorkingSets[0];
+								if (!IWorkingSetIDs.OTHERS.equals(ws.getId())) {
+									ArrayList<IAdaptable> newElements= new ArrayList<>();
+									newElements.addAll(Arrays.asList(ws.getElements()));
+									newElements.addAll(Arrays.asList(ws.adaptElements(new IAdaptable[] { fDestination.getJavaProject() })));
+									ws.setElements(newElements.toArray(new IAdaptable[newElements.size()]));
 								}
 							}
 						}, monitor);
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameFieldWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameFieldWizard.java
index 1ee6aa8f41..401a716e6c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameFieldWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameFieldWizard.java
@@ -138,12 +138,9 @@ public class RenameFieldWizard extends RenameRefactoringWizard {
 		}
 
 		private void getGetterSetterRenamingEnablement() {
-			BusyIndicator.showWhile(getShell().getDisplay(), new Runnable(){
-				@Override
-				public void run() {
-					checkGetterRenamingEnablement();
-					checkSetterRenamingEnablement();
-				}
+			BusyIndicator.showWhile(getShell().getDisplay(), () -> {
+				checkGetterRenamingEnablement();
+				checkSetterRenamingEnablement();
 			});
 		}
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java
index c0d6241b15..504eac2533 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameInformationPopup.java
@@ -20,15 +20,11 @@ import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.ShellAdapter;
@@ -114,28 +110,25 @@ public class RenameInformationPopup implements IWidgetTokenKeeper, IWidgetTokenK
 			fEditor.getSite().getShell().addControlListener(this);
 			viewer.addTextListener(this);
 			viewer.addViewportListener(this);
-			fPopup.addDisposeListener(new DisposeListener() {
-				@Override
-				public void widgetDisposed(DisposeEvent e) {
-					fEditor.getSite().getWorkbenchWindow().getPartService().removePartListener(PopupVisibilityManager.this);
-					if (! textWidget.isDisposed()) {
-						textWidget.removeControlListener(PopupVisibilityManager.this);
-						textWidget.removeMouseListener(PopupVisibilityManager.this);
-						textWidget.removeKeyListener(PopupVisibilityManager.this);
-					}
-					fEditor.getSite().getShell().removeControlListener(PopupVisibilityManager.this);
-					viewer.removeTextListener(PopupVisibilityManager.this);
-					viewer.removeViewportListener(PopupVisibilityManager.this);
-					if (fMenuImage != null) {
-						fMenuImage.dispose();
-						fMenuImage= null;
-					}
-					if (fMenuManager != null) {
-						fMenuManager.dispose();
-						fMenuManager= null;
-					}
-					fRenameLinkedMode.cancel();
+			fPopup.addDisposeListener(e -> {
+				fEditor.getSite().getWorkbenchWindow().getPartService().removePartListener(PopupVisibilityManager.this);
+				if (! textWidget.isDisposed()) {
+					textWidget.removeControlListener(PopupVisibilityManager.this);
+					textWidget.removeMouseListener(PopupVisibilityManager.this);
+					textWidget.removeKeyListener(PopupVisibilityManager.this);
 				}
+				fEditor.getSite().getShell().removeControlListener(PopupVisibilityManager.this);
+				viewer.removeTextListener(PopupVisibilityManager.this);
+				viewer.removeViewportListener(PopupVisibilityManager.this);
+				if (fMenuImage != null) {
+					fMenuImage.dispose();
+					fMenuImage= null;
+				}
+				if (fMenuManager != null) {
+					fMenuManager.dispose();
+					fMenuManager= null;
+				}
+				fRenameLinkedMode.cancel();
 			});
 		}
 
@@ -347,26 +340,17 @@ public class RenameInformationPopup implements IWidgetTokenKeeper, IWidgetTokenK
 					return;
 
 				final Shell editorShell= fEditor.getSite().getShell();
-				display.asyncExec(new Runnable() {
-					// post to UI thread since editor shell only gets activated after popup has lost focus
-					@Override
-					public void run() {
-						Shell activeShell= display.getActiveShell();
-						if (activeShell != editorShell) {
-							fRenameLinkedMode.cancel();
-						}
+				display.asyncExec(() -> {
+					Shell activeShell= display.getActiveShell();
+					if (activeShell != editorShell) {
+						fRenameLinkedMode.cancel();
 					}
 				});
 			}
 		});
 
 		if (! MAC) { // carbon and cocoa draw their own border...
-			fPopup.addPaintListener(new PaintListener() {
-				@Override
-				public void paintControl(PaintEvent pe) {
-					pe.gc.drawPolygon(getPolygon(true));
-				}
-			});
+			fPopup.addPaintListener(pe -> pe.gc.drawPolygon(getPolygon(true)));
 		}
 
 //		fPopup.moveBelow(null); // make sure hovers are on top of the info popup
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java
index b7b798ce9f..7c20586532 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameLinkedMode.java
@@ -36,12 +36,10 @@ import org.eclipse.core.commands.operations.OperationHistoryFactory;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
@@ -417,20 +415,17 @@ public class RenameLinkedMode {
 
 		try {
 			if (! fOriginalName.equals(newName)) {
-				fEditor.getSite().getWorkbenchWindow().run(false, true, new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						if (viewer instanceof ITextViewerExtension6) {
-							IUndoManager undoManager= ((ITextViewerExtension6)viewer).getUndoManager();
-							if (undoManager instanceof IUndoManagerExtension) {
-								IUndoManagerExtension undoManagerExtension= (IUndoManagerExtension)undoManager;
-								IUndoContext undoContext= undoManagerExtension.getUndoContext();
-								IOperationHistory operationHistory= OperationHistoryFactory.getOperationHistory();
-								while (undoManager.undoable()) {
-									if (fStartingUndoOperation != null && fStartingUndoOperation.equals(operationHistory.getUndoOperation(undoContext)))
-										return;
-									undoManager.undo();
-								}
+				fEditor.getSite().getWorkbenchWindow().run(false, true, monitor -> {
+					if (viewer instanceof ITextViewerExtension6) {
+						IUndoManager undoManager= ((ITextViewerExtension6)viewer).getUndoManager();
+						if (undoManager instanceof IUndoManagerExtension) {
+							IUndoManagerExtension undoManagerExtension= (IUndoManagerExtension)undoManager;
+							IUndoContext undoContext= undoManagerExtension.getUndoContext();
+							IOperationHistory operationHistory= OperationHistoryFactory.getOperationHistory();
+							while (undoManager.undoable()) {
+								if (fStartingUndoOperation != null && fStartingUndoOperation.equals(operationHistory.getUndoOperation(undoContext)))
+									return;
+								undoManager.undo();
 							}
 						}
 					}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java
index 997c45bfea..1883f0387f 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameSelectionState.java
@@ -122,12 +122,7 @@ public class RenameSelectionState {
 				}
 			}
 			if (changed) {
-				fDisplay.asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						target.selectReveal(newSelection[0]);
-					}
-				});
+				fDisplay.asyncExec(() -> target.selectReveal(newSelection[0]));
 			}
 		}
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardInputPage.java
index d7797e635d..5e95a9f9bc 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardInputPage.java
@@ -26,10 +26,8 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.IWizardPage;
 
@@ -165,20 +163,16 @@ class RenameTypeWizardInputPage extends RenameInputWizardPage {
 		if (wizard.isRenameType()) {
 			final RenameTypeProcessor renameTypeProcessor= wizard.getRenameTypeProcessor();
 			try {
-				getContainer().run(true, true, new IRunnableWithProgress() {
-
-					@Override
-					public void run(IProgressMonitor pm) throws InterruptedException {
-						try {
-							renameTypeProcessor.initializeReferences(pm);
-						} catch (OperationCanceledException e) {
-							throw new InterruptedException();
-						} catch (CoreException e) {
-							ExceptionHandler.handle(e, RefactoringMessages.RenameTypeWizard_defaultPageTitle,
-									RefactoringMessages.RenameTypeWizard_unexpected_exception);
-						} finally {
-							pm.done();
-						}
+				getContainer().run(true, true, pm -> {
+					try {
+						renameTypeProcessor.initializeReferences(pm);
+					} catch (OperationCanceledException e1) {
+						throw new InterruptedException();
+					} catch (CoreException e2) {
+						ExceptionHandler.handle(e2, RefactoringMessages.RenameTypeWizard_defaultPageTitle,
+								RefactoringMessages.RenameTypeWizard_unexpected_exception);
+					} finally {
+						pm.done();
 					}
 				});
 			} catch (InvocationTargetException e) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsOptionsDialog.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsOptionsDialog.java
index 0630b1017c..05837040d3 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsOptionsDialog.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsOptionsDialog.java
@@ -29,8 +29,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jdt.internal.corext.refactoring.rename.RenamingNameSuggestor;
 
 import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
-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.SelectionButtonDialogField;
 
@@ -125,31 +123,19 @@ public class RenameTypeWizardSimilarElementsOptionsDialog extends MessageDialog
 		fWarningLabel.setLayoutData(gridData);
 		fWarningLabel.setFont(warningComposite.getFont());
 
-		fExactStrategyRadio.setDialogFieldListener(new IDialogFieldListener() {
-
-			@Override
-			public void dialogFieldChanged(DialogField field) {
-				updateLabel();
-				fSelectedStrategy= RenamingNameSuggestor.STRATEGY_EXACT;
-			}
+		fExactStrategyRadio.setDialogFieldListener(field -> {
+			updateLabel();
+			fSelectedStrategy= RenamingNameSuggestor.STRATEGY_EXACT;
 		});
 
-		fEmbeddedStrategyRadio.setDialogFieldListener(new IDialogFieldListener() {
-
-			@Override
-			public void dialogFieldChanged(DialogField field) {
-				updateLabel();
-				fSelectedStrategy= RenamingNameSuggestor.STRATEGY_EMBEDDED;
-			}
+		fEmbeddedStrategyRadio.setDialogFieldListener(field -> {
+			updateLabel();
+			fSelectedStrategy= RenamingNameSuggestor.STRATEGY_EMBEDDED;
 		});
 
-		fSuffixStrategyRadio.setDialogFieldListener(new IDialogFieldListener() {
-
-			@Override
-			public void dialogFieldChanged(DialogField field) {
-				updateLabel();
-				fSelectedStrategy= RenamingNameSuggestor.STRATEGY_SUFFIX;
-			}
+		fSuffixStrategyRadio.setDialogFieldListener(field -> {
+			updateLabel();
+			fSelectedStrategy= RenamingNameSuggestor.STRATEGY_SUFFIX;
 		});
 
 		updateLabel();
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
index d90c0033cf..1dabd8dd0c 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/RenameTypeWizardSimilarElementsPage.java
@@ -47,10 +47,7 @@ import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
-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.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -484,20 +481,8 @@ class RenameTypeWizardSimilarElementsPage extends UserInputWizardPage {
 		fTreeViewer.setContentProvider(new SimilarElementTreeContentProvider());
 		fTreeViewerLabelProvider= new SimilarLabelProvider();
 		fTreeViewer.setLabelProvider(fTreeViewerLabelProvider);
-		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				RenameTypeWizardSimilarElementsPage.this.treeViewerSelectionChanged(event);
-			}
-		});
-		fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				RenameTypeWizardSimilarElementsPage.this.editCurrentElement();
-			}
-		});
+		fTreeViewer.addSelectionChangedListener(event -> RenameTypeWizardSimilarElementsPage.this.treeViewerSelectionChanged(event));
+		fTreeViewer.addDoubleClickListener(event -> RenameTypeWizardSimilarElementsPage.this.editCurrentElement());
 	}
 
 	private void createSourceViewerComposite(Composite parent) {
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgMoveWizard.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgMoveWizard.java
index 7e21a5803d..b7a5f3cab4 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgMoveWizard.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgMoveWizard.java
@@ -16,8 +16,6 @@ package org.eclipse.jdt.internal.ui.refactoring.reorg;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -257,13 +255,10 @@ public class ReorgMoveWizard extends RefactoringWizard {
 				firstLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 				Control label= super.addLabel(firstLine);
-				label.addTraverseListener(new TraverseListener() {
-					@Override
-					public void keyTraversed(TraverseEvent e) {
-						if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) {
-							e.detail= SWT.TRAVERSE_NONE;
-							getTreeViewer().getTree().setFocus();
-						}
+				label.addTraverseListener(e -> {
+					if (e.detail == SWT.TRAVERSE_MNEMONIC && e.doit) {
+						e.detail= SWT.TRAVERSE_NONE;
+						getTreeViewer().getTree().setFocus();
 					}
 				});
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgQueries.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgQueries.java
index 0189764802..435701ce38 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgQueries.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgQueries.java
@@ -174,21 +174,18 @@ public class ReorgQueries implements IReorgQueries {
 		}
 
 		private Runnable createQueryRunnable(final String question, final Object[] elements, final int[] result) {
-			return new Runnable() {
-				@Override
-				public void run() {
-					ListDialog dialog= new YesNoListDialog(fShell, true);
-					dialog.setAddCancelButton(false);
-					dialog.setBlockOnOpen(true);
-					dialog.setContentProvider(ArrayContentProvider.getInstance());
-					dialog.setLabelProvider(new JavaElementLabelProvider());
-					dialog.setTitle(fDialogTitle);
-					dialog.setMessage(question);
-					dialog.setInput(elements);
-
-					dialog.open();
-					result[0]= dialog.getReturnCode();
-				}
+			return () -> {
+				ListDialog dialog= new YesNoListDialog(fShell, true);
+				dialog.setAddCancelButton(false);
+				dialog.setBlockOnOpen(true);
+				dialog.setContentProvider(ArrayContentProvider.getInstance());
+				dialog.setLabelProvider(new JavaElementLabelProvider());
+				dialog.setTitle(fDialogTitle);
+				dialog.setMessage(question);
+				dialog.setInput(elements);
+
+				dialog.open();
+				result[0]= dialog.getReturnCode();
 			};
 		}
 
@@ -286,21 +283,18 @@ public class ReorgQueries implements IReorgQueries {
 		}
 
 		private Runnable createQueryRunnable(final String question, final Object[] elements, final int[] result) {
-			return new Runnable() {
-				@Override
-				public void run() {
-					ListDialog dialog= new YesNoListDialog(fShell, false);
-					dialog.setAddCancelButton(false);
-					dialog.setBlockOnOpen(true);
-					dialog.setContentProvider(ArrayContentProvider.getInstance());
-					dialog.setLabelProvider(new JavaElementLabelProvider());
-					dialog.setTitle(fDialogTitle);
-					dialog.setMessage(question);
-					dialog.setInput(elements);
-
-					dialog.open();
-					result[0]= dialog.getReturnCode();
-				}
+			return () -> {
+				ListDialog dialog= new YesNoListDialog(fShell, false);
+				dialog.setAddCancelButton(false);
+				dialog.setBlockOnOpen(true);
+				dialog.setContentProvider(ArrayContentProvider.getInstance());
+				dialog.setLabelProvider(new JavaElementLabelProvider());
+				dialog.setTitle(fDialogTitle);
+				dialog.setMessage(question);
+				dialog.setInput(elements);
+
+				dialog.open();
+				result[0]= dialog.getReturnCode();
 			};
 		}
 
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgUserInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgUserInputPage.java
index 218b86bd85..dadccc74cf 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgUserInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/reorg/ReorgUserInputPage.java
@@ -28,7 +28,6 @@ import org.eclipse.jface.dialogs.Dialog;
 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.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -74,12 +73,7 @@ abstract class ReorgUserInputPage extends UserInputWizardPage{
 
 		fViewer= createViewer(result);
 		fViewer.setSelection(new StructuredSelection(initialSelection), true);
-		fViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				ReorgUserInputPage.this.viewerSelectionChanged(event);
-			}
-		});
+		fViewer.addSelectionChangedListener(event -> ReorgUserInputPage.this.viewerSelectionChanged(event));
 		fViewer.addDoubleClickListener(new TreeViewerDoubleClickListener());
 		Dialog.applyDialogFont(result);
 	}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
index b3a6d6dbdc..81305e322a 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java
@@ -19,8 +19,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -135,12 +133,7 @@ public class SelfEncapsulateFieldInputPage extends UserInputWizardPage {
 		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
 		gd.widthHint= convertWidthInCharsToPixels(25);
 		fGetterName.setLayoutData(gd);
-		fGetterName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doGetterModified();
-			}
-		});
+		fGetterName.addModifyListener(e -> doGetterModified());
 		TextFieldNavigationHandler.install(fGetterName);
 
 
@@ -178,12 +171,7 @@ public class SelfEncapsulateFieldInputPage extends UserInputWizardPage {
 		gd= new GridData(GridData.FILL_HORIZONTAL);
 		gd.widthHint= convertWidthInCharsToPixels(25);
 		fSetterName.setLayoutData(gd);
-		fSetterName.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doSetterModified();
-			}
-		});
+		fSetterName.addModifyListener(e -> doSetterModified());
 		TextFieldNavigationHandler.install(fSetterName);
 
 		fSetterInfo= new Label(nameComposite, SWT.LEAD);