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

For test test code

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

33 files changed, 181 insertions, 437 deletions

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakContinueTargetFinderTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakContinueTargetFinderTest.java
index 5f053ed41b..3fd8a7ebdd 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakContinueTargetFinderTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/BreakContinueTargetFinderTest.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.Arrays;
-import java.util.Comparator;
 
 import org.junit.After;
 import org.junit.Before;
@@ -98,12 +97,7 @@ public class BreakContinueTargetFinderTest {
 	}
 
 	private void sortByStartIndex(OccurrenceLocation[] OccurrenceLocations) {
-		Arrays.sort(OccurrenceLocations, new Comparator<OccurrenceLocation>() {
-			@Override
-			public int compare(OccurrenceLocation node0, OccurrenceLocation node1) {
-				return node0.getOffset() - node1.getOffset();
-			}
-		});
+		Arrays.sort(OccurrenceLocations, (node0, node1) -> node0.getOffset() - node1.getOffset());
 	}
 
 	//pattern must be found - otherwise it's assumed to be an error
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java
index ff87b17a24..2804d6c877 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPartitionerTest.java
@@ -28,7 +28,6 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.TypedRegion;
 
@@ -52,12 +51,7 @@ public class JavaPartitionerTest {
 		fDocument.set("xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx");
 
 		fDocumentPartitioningChanged= false;
-		fDocument.addDocumentPartitioningListener(new IDocumentPartitioningListener() {
-			@Override
-			public void documentPartitioningChanged(IDocument document) {
-				fDocumentPartitioningChanged= true;
-			}
-		});
+		fDocument.addDocumentPartitioningListener(document -> fDocumentPartitioningChanged= true);
 	}
 
 	@After
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d7.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d7.java
index e1ca9d61ae..3d3d429216 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d7.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d7.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.Arrays;
-import java.util.Comparator;
 
 import org.junit.After;
 import org.junit.Before;
@@ -106,12 +105,7 @@ public class MarkOccurrenceTest1d7 {
 	}
 
 	private void sortByStartIndex(OccurrenceLocation[] OccurrenceLocations) {
-		Arrays.sort(OccurrenceLocations, new Comparator<OccurrenceLocation>() {
-			@Override
-			public int compare(OccurrenceLocation node0, OccurrenceLocation node1) {
-				return node0.getOffset() - node1.getOffset();
-			}
-		});
+		Arrays.sort(OccurrenceLocations, (node0, node1) -> node0.getOffset() - node1.getOffset());
 	}
 
 	//pattern must be found - otherwise it's assumed to be an error
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d8.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d8.java
index 4a8e7bc81f..05315e2b01 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d8.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/MarkOccurrenceTest1d8.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import java.util.Arrays;
-import java.util.Comparator;
 
 import org.junit.After;
 import org.junit.Before;
@@ -103,12 +102,7 @@ public class MarkOccurrenceTest1d8 {
 	}
 
 	private void sortByStartIndex(OccurrenceLocation[] OccurrenceLocations) {
-		Arrays.sort(OccurrenceLocations, new Comparator<OccurrenceLocation>() {
-			@Override
-			public int compare(OccurrenceLocation node0, OccurrenceLocation node1) {
-				return node0.getOffset() - node1.getOffset();
-			}
-		});
+		Arrays.sort(OccurrenceLocations, (node0, node1) -> node0.getOffset() - node1.getOffset());
 	}
 
 	//pattern must be found - otherwise it's assumed to be an error
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PropertiesFilePartitionerTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PropertiesFilePartitionerTest.java
index ae131c177a..1a3f390d4c 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PropertiesFilePartitionerTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PropertiesFilePartitionerTest.java
@@ -29,7 +29,6 @@ import org.eclipse.jface.text.BadPartitioningException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.TypedRegion;
 
@@ -54,12 +53,7 @@ public class PropertiesFilePartitionerTest {
 		//             01234567890 1234567890 1234567890 123456789
 
 		fDocumentPartitioningChanged= false;
-		fDocument.addDocumentPartitioningListener(new IDocumentPartitioningListener() {
-			@Override
-			public void documentPartitioningChanged(IDocument document) {
-				fDocumentPartitioningChanged= true;
-			}
-		});
+		fDocument.addDocumentPartitioningListener(document -> fDocumentPartitioningChanged= true);
 	}
 
 	@After
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java
index ef7cfb4cd8..eb2fc5c142 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EditorTestHelper.java
@@ -54,7 +54,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IWidgetTokenKeeper;
-import org.eclipse.jface.text.IWidgetTokenOwner;
 import org.eclipse.jface.text.reconciler.AbstractReconciler;
 import org.eclipse.jface.text.source.SourceViewer;
 
@@ -420,12 +419,7 @@ public class EditorTestHelper {
 	}
 
 	public static void closeAllPopUps(SourceViewer sourceViewer) {
-		IWidgetTokenKeeper tokenKeeper= new IWidgetTokenKeeper() {
-			@Override
-			public boolean requestWidgetToken(IWidgetTokenOwner owner) {
-				return true;
-			}
-		};
+		IWidgetTokenKeeper tokenKeeper= owner -> true;
 		sourceViewer.requestWidgetToken(tokenKeeper, Integer.MAX_VALUE);
 		sourceViewer.releaseWidgetToken(tokenKeeper);
 	}
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
index c0de788a84..ad79df082b 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
@@ -17,7 +17,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
@@ -245,25 +244,9 @@ public class KeyboardProbe {
 	}
 
 	private void addListeners(Text control) {
-		control.addListener(SWT.KeyDown, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				onKeyDown(event);
-			}
-		});
-		control.addListener(SWT.KeyUp, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				onKeyUp(event);
-			}
-		});
-		control.addListener(SWT.Modify, new Listener() {
-
-			@Override
-			public void handleEvent(Event event) {
-				onModify();
-			}
-		});
+		control.addListener(SWT.KeyDown, event -> onKeyDown(event));
+		control.addListener(SWT.KeyUp, event -> onKeyUp(event));
+		control.addListener(SWT.Modify, event -> onModify());
 	}
 
 	private Text createControl(Display display) {
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java
index 1835e5cab1..7c6d795ce1 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/MouseScrollEditorTest.java
@@ -108,12 +108,7 @@ public abstract class MouseScrollEditorTest extends TextPerformanceTestCase {
 	private Runnable fThreadRunnable= new Runnable() {
 		private volatile int fTopPixel;
 		private int fOldTopPixel;
-		private Runnable fRunnable= new Runnable() {
-			@Override
-			public void run() {
-				fTopPixel= fText.getTopPixel();
-			}
-		};
+		private Runnable fRunnable= () -> fTopPixel= fText.getTopPixel();
 		private Condition fCondition= new Condition() {
 			@Override
 			public boolean isTrue() {
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractJunit4SelectionTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractJunit4SelectionTestCase.java
index c9d5f0d3e6..d4b77bdd37 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractJunit4SelectionTestCase.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AbstractJunit4SelectionTestCase.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -121,12 +120,7 @@ public abstract class AbstractJunit4SelectionTestCase extends AbstractJunit4CUTe
 					refactoring, getCheckingStyle());
 				if (fIsPreDeltaTest) {
 					IWorkspace workspace= ResourcesPlugin.getWorkspace();
-					IResourceChangeListener listener= new IResourceChangeListener() {
-						@Override
-						public void resourceChanged(IResourceChangeEvent event) {
-							TestModelProvider.assertTrue(event.getDelta());
-						}
-					};
+					IResourceChangeListener listener= event -> TestModelProvider.assertTrue(event.getDelta());
 					try {
 						clearPreDelta();
 						workspace.checkpoint(false);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/DocumentChangeTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/DocumentChangeTest.java
index 6c5435257f..96474ddfb1 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/DocumentChangeTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/DocumentChangeTest.java
@@ -27,7 +27,6 @@ import org.eclipse.jdt.testplugin.JavaTestPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
@@ -140,22 +139,14 @@ public class DocumentChangeTest extends GenericRefactoringTest {
 
 		final MultiStatus statusCollector= new MultiStatus(JavaTestPlugin.getPluginId(), 0, "", null);
 
-		ILogListener logListener= new ILogListener() {
-			@Override
-			public void logging(IStatus status, String plugin) {
-				statusCollector.add(status);
-			}
-		};
+		ILogListener logListener= (status, plugin) -> statusCollector.add(status);
 		Platform.addLogListener(logListener);
 		try {
-			IRunnableWithProgress runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						performRefactoring(ref);
-					} catch (Exception e) {
-						throw new InvocationTargetException(e);
-					}
+			IRunnableWithProgress runnable= monitor -> {
+				try {
+					performRefactoring(ref);
+				} catch (Exception e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			JavaPlugin.getActiveWorkbenchWindow().run(true, true, runnable);
@@ -167,14 +158,11 @@ public class DocumentChangeTest extends GenericRefactoringTest {
 
 			// undo:
 
-			runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
-					} catch (Exception e) {
-						throw new InvocationTargetException(e);
-					}
+			runnable= monitor -> {
+				try {
+					RefactoringCore.getUndoManager().performUndo(null, new NullProgressMonitor());
+				} catch (Exception e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			JavaPlugin.getActiveWorkbenchWindow().run(true, true, runnable);
@@ -189,14 +177,11 @@ public class DocumentChangeTest extends GenericRefactoringTest {
 
 			JavaPlugin.getActivePage().closeEditor(editor, true);
 
-			runnable= new IRunnableWithProgress() {
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
-					} catch (Exception e) {
-						throw new InvocationTargetException(e);
-					}
+			runnable= monitor -> {
+				try {
+					RefactoringCore.getUndoManager().performRedo(null, new NullProgressMonitor());
+				} catch (Exception e) {
+					throw new InvocationTargetException(e);
 				}
 			};
 			JavaPlugin.getActiveWorkbenchWindow().run(true, true, runnable);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/GenericRefactoringTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/GenericRefactoringTest.java
index a67e345a28..123fe28560 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/GenericRefactoringTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/GenericRefactoringTest.java
@@ -42,7 +42,6 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -319,12 +318,9 @@ public abstract class GenericRefactoringTest {
 		perform.setUndoManager(undoManager, ref.getName());
 		IWorkspace workspace= ResourcesPlugin.getWorkspace();
 		if (fIsPreDeltaTest) {
-			IResourceChangeListener listener= new IResourceChangeListener() {
-				@Override
-				public void resourceChanged(IResourceChangeEvent event) {
-					if (create.getConditionCheckingStatus().isOK() &&  perform.changeExecuted()) {
-						TestModelProvider.assertTrue(event.getDelta());
-					}
+			IResourceChangeListener listener= event -> {
+				if (create.getConditionCheckingStatus().isOK() &&  perform.changeExecuted()) {
+					TestModelProvider.assertTrue(event.getDelta());
 				}
 			};
 			try {
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java
index b3b67b1dc9..ca72e6cfec 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/LineColumnSelectionTestCase.java
@@ -23,12 +23,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.StringTokenizer;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-import org.eclipse.core.resources.IWorkspaceRunnable;
-
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.Refactoring;
 
@@ -96,24 +92,21 @@ public abstract class LineColumnSelectionTestCase extends AbstractJunit4CUTestCa
 
 	/* @require refactoring.checkActivation().isOK() */
 	protected void performTest(final ICompilationUnit unit, final Refactoring refactoring, final String out) throws Exception {
-		JavaCore.run(new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				String original= unit.getSource();
-				final Change change= refactoring.createChange(monitor);
-				assertNotNull(change);
-				change.initializeValidationData(new NullProgressMonitor());
-				assertFalse(change.isValid(new NullProgressMonitor()).hasFatalError());
-				Change undo= change.perform(monitor);
-				change.dispose();
-				assertNotNull(undo);
-				compareSource(unit.getSource(), out);
-				undo.initializeValidationData(new NullProgressMonitor());
-				assertFalse(undo.isValid(new NullProgressMonitor()).hasFatalError());
-				undo.perform(monitor);
-				undo.dispose();
-				compareSource(unit.getSource(), original);
-			}
+		JavaCore.run(monitor -> {
+			String original= unit.getSource();
+			final Change change= refactoring.createChange(monitor);
+			assertNotNull(change);
+			change.initializeValidationData(new NullProgressMonitor());
+			assertFalse(change.isValid(new NullProgressMonitor()).hasFatalError());
+			Change undo= change.perform(monitor);
+			change.dispose();
+			assertNotNull(undo);
+			compareSource(unit.getSource(), out);
+			undo.initializeValidationData(new NullProgressMonitor());
+			assertFalse(undo.isValid(new NullProgressMonitor()).hasFatalError());
+			undo.perform(monitor);
+			undo.dispose();
+			compareSource(unit.getSource(), original);
 		}, new NullProgressMonitor());
 	}
 }
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
index 738d5592ae..537e8e900a 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/TestModelProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.mapping.ModelProvider;
 
 public class TestModelProvider extends ModelProvider {
@@ -270,12 +269,9 @@ public class TestModelProvider extends ModelProvider {
 
 	private static void assertCopySource(IResourceDelta delta) {
 		try {
-			delta.accept(new IResourceDeltaVisitor() {
-				@Override
-				public boolean visit(IResourceDelta d) throws CoreException {
-					Assert.assertTrue("Not a copy delta", (d.getKind() & ~IResourceDelta.CHANGED) == 0);
-					return true;
-				}
+			delta.accept(d -> {
+				Assert.assertTrue("Not a copy delta", (d.getKind() & ~IResourceDelta.CHANGED) == 0);
+				return true;
 			});
 		} catch (CoreException e) {
 			Assert.assertTrue("Shouldn't happen", false);
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
index b2c38fabfe..7f872768ca 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyTest.java
@@ -204,12 +204,7 @@ public class CopyTest extends GenericRefactoringTest {
 
 		@Override
 		public INewNameQuery createStaticQuery(final String newName) {
-			return new INewNameQuery(){
-				@Override
-				public String getNewName() {
-					return newName;
-				}
-			};
+			return () -> newName;
 		}
 
 		@Override
@@ -249,11 +244,8 @@ public class CopyTest extends GenericRefactoringTest {
 		}
 		@Override
 		public INewNameQuery createNullQuery() {
-			return new INewNameQuery() {
-				@Override
-				public String getNewName() {
-					throw new OperationCanceledException();
-				}
+			return () -> {
+				throw new OperationCanceledException();
 			};
 		}
 		@Override
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
index 96a8334c0b..f245ebec42 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ccp/CopyToClipboardActionTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 
 import org.junit.Rule;
@@ -233,12 +232,7 @@ public class CopyToClipboardActionTest extends GenericRefactoringTest {
 	}
 
 	private static void sortByName(Object[] copied) {
-		Arrays.sort(copied, new Comparator<Object>(){
-			@Override
-			public int compare(Object arg0, Object arg1) {
-				return getName(arg0).compareTo(getName(arg1));
-			}
-		});
+		Arrays.sort(copied, (arg0, arg1) -> getName(arg0).compareTo(getName(arg1)));
 	}
 
 	private void checkNames(IResource[] resourcesCopied, IJavaElement[] javaElementsCopied, String clipboardText){
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
index cbd67bc4e5..08db58ae2b 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/infra/RefactoringTestRepositoryProvider.java
@@ -21,7 +21,6 @@ import org.eclipse.team.core.RepositoryProvider;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
@@ -90,15 +89,12 @@ public class RefactoringTestRepositoryProvider extends RepositoryProvider {
 		private IStatus makeWritable(final IFile[] resources) {
 			try {
 				ResourcesPlugin.getWorkspace().run(
-					new IWorkspaceRunnable() {
-						@Override
-						public void run(IProgressMonitor monitor) throws CoreException	{
-							for (IFile resource : resources) {
-								ResourceAttributes resourceAttributes = resource.getResourceAttributes();
-								if (resourceAttributes != null) {
-									resourceAttributes.setReadOnly(false);
-									resource.setResourceAttributes(resourceAttributes);
-								}
+					(IWorkspaceRunnable) monitor -> {
+						for (IFile resource : resources) {
+							ResourceAttributes resourceAttributes = resource.getResourceAttributes();
+							if (resourceAttributes != null) {
+								resourceAttributes.setReadOnly(false);
+								resource.setResourceAttributes(resourceAttributes);
 							}
 						}
 					},
diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/JavaElementLightweightDecorator.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/JavaElementLightweightDecorator.java
index a014dff9df..41c1fdee6c 100644
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/JavaElementLightweightDecorator.java
+++ b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/JavaElementLightweightDecorator.java
@@ -107,12 +107,9 @@ public class JavaElementLightweightDecorator extends LabelProvider implements IL
 
 	public JavaElementLightweightDecorator() {
 		final FontRegistry fontRegistry= PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry();
-		Display.getDefault().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				fColor= new Color(Display.getDefault(), 100, 100, 100);
-				fBold= fontRegistry.getBold(JFaceResources.DEFAULT_FONT);
-			}
+		Display.getDefault().syncExec(() -> {
+			fColor= new Color(Display.getDefault(), 100, 100, 100);
+			fBold= fontRegistry.getBold(JFaceResources.DEFAULT_FONT);
 		});
 		fListener= new FileBufferListener();
 		FileBuffers.getTextFileBufferManager().addFileBufferListener(fListener);
diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java
index 856918b4d9..a073c72bd7 100644
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java
+++ b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MultiElementListSelectorExample.java
@@ -19,8 +19,6 @@ import java.util.Random;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
-
 import org.eclipse.jface.viewers.ILabelProvider;
 
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
@@ -39,18 +37,15 @@ public class MultiElementListSelectorExample {
 	public static void main(String[] args) {
 
 
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			@Override
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection.length == 1) {
-					return new StatusInfo();
-				} else {
-					StatusInfo status= new StatusInfo();
-					status.setError("Single selection");
-					return status;
-				}
-
+		ISelectionStatusValidator validator= selection -> {
+			if (selection != null && selection.length == 1) {
+				return new StatusInfo();
+			} else {
+				StatusInfo status= new StatusInfo();
+				status.setError("Single selection");
+				return status;
 			}
+
 		};
 
 
diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyJavadocExportWizardPage.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyJavadocExportWizardPage.java
index 9b77196d90..ab21c57195 100644
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyJavadocExportWizardPage.java
+++ b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/MyJavadocExportWizardPage.java
@@ -19,7 +19,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -60,12 +59,7 @@ public class MyJavadocExportWizardPage extends JavadocExportWizardPage {
 
 	@Override
 	public Control createContents(Composite parent) {
-		ModifyListener modifyListener= new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validateInputs();
-			}
-		};
+		ModifyListener modifyListener= e -> validateInputs();
 
 		Composite composite= new Composite(parent, SWT.NONE);
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TestMoveDescriptorAction.java b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TestMoveDescriptorAction.java
index d85895d62e..5d7334e24b 100644
--- a/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TestMoveDescriptorAction.java
+++ b/org.eclipse.jdt.ui.tests/examples/org/eclipse/jdt/ui/examples/TestMoveDescriptorAction.java
@@ -25,7 +25,6 @@ import org.eclipse.core.resources.IFolder;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
@@ -73,14 +72,11 @@ public class TestMoveDescriptorAction extends Action implements IActionDelegate
 	public void run(IAction action) {
 		try {
 			if (fCU != null) {
-				PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() {
-					@Override
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						try {
-							performAction(monitor);
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						}
+				PlatformUI.getWorkbench().getProgressService().run(true, true, monitor -> {
+					try {
+						performAction(monitor);
+					} catch (CoreException e) {
+						throw new InvocationTargetException(e);
 					}
 				});
 			}
diff --git a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java
index f9bdfd2d6a..c4792d8d00 100644
--- a/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java
+++ b/org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/tests/leaks/JavaLeakTest.java
@@ -453,12 +453,7 @@ public class JavaLeakTest extends LeakTestCase {
 
         menu.setVisible(true);
 
-		display.asyncExec(new Runnable() {
-            @Override
-			public void run() {
-                menu.setVisible(false);
-            }
-        });
+		display.asyncExec(() -> menu.setVisible(false));
 
         while (!menu.isDisposed() && display.readAndDispatch()) {
         	//loop, don't sleep
diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/OpenTypePerfTest.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/OpenTypePerfTest.java
index ff41f908fd..6d54f64611 100644
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/OpenTypePerfTest.java
+++ b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/OpenTypePerfTest.java
@@ -25,7 +25,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
@@ -193,12 +192,9 @@ public class OpenTypePerfTest extends JdtPerformanceTestCase {
 				new TypeSelectionExtension() {
 					@Override
 					public ISelectionStatusValidator getSelectionValidator() {
-						return new ISelectionStatusValidator() {
-							@Override
-							public IStatus validate(Object[] selection) {
-								finish(openFirst);
-								return Status.OK_STATUS;
-							}
+						return selection -> {
+							finish(openFirst);
+							return Status.OK_STATUS;
 						};
 					}
 				});
@@ -227,20 +223,12 @@ public class OpenTypePerfTest extends JdtPerformanceTestCase {
 
 		if (! openFirst) {
 			stopMeasuring();
-			fShell.getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					openTypeDialog.close();
-				}
-			});
+			fShell.getDisplay().asyncExec(() -> openTypeDialog.close());
 
 		} else {
-			fShell.getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					openTypeDialog.getOkButton().notifyListeners(SWT.Selection, new Event());
-					stopMeasuring();
-				}
+			fShell.getDisplay().asyncExec(() -> {
+				openTypeDialog.getOkButton().notifyListeners(SWT.Selection, new Event());
+				stopMeasuring();
 			});
 		}
 	}
diff --git a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java
index e80e273747..f2f4166ccb 100644
--- a/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java
+++ b/org.eclipse.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/views/PackageExplorerPerfTest.java
@@ -26,12 +26,10 @@ import org.eclipse.jdt.testplugin.JavaTestPlugin;
 import org.eclipse.test.OrderedTestSuite;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 
@@ -139,12 +137,7 @@ public class PackageExplorerPerfTest extends JdtPerformanceTestCase {
 			}
 		}
 
-		javaProject.getProject().getWorkspace().run(new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				javaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-			}
-		}, null);
+		javaProject.getProject().getWorkspace().run((IWorkspaceRunnable) monitor -> javaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null), null);
 		getViewer().expandToLevel(classFolder, 1);
 
 		PackageExplorerPart view= getView();
@@ -162,15 +155,12 @@ public class PackageExplorerPerfTest extends JdtPerformanceTestCase {
 
 	private void touchAllFilesOnDisk(IFolder folder) throws CoreException {
 		final long now= System.currentTimeMillis();
-		folder.accept(new IResourceVisitor() {
-			@Override
-			public boolean visit(IResource resource) throws CoreException {
-				if (resource instanceof IFile) {
-					IFile file= (IFile) resource;
-					file.getRawLocation().toFile().setLastModified(now);
-				}
-				return true;
+		folder.accept(resource -> {
+			if (resource instanceof IFile) {
+				IFile file= (IFile) resource;
+				file.getRawLocation().toFile().setLastModified(now);
 			}
+			return true;
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java
index b1ddc7a8be..2afa6c998c 100644
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java
+++ b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/JavaProjectHelper.java
@@ -440,16 +440,13 @@ public class JavaProjectHelper {
 		if (ASSERT_NO_MIXED_LINE_DELIMIERS)
 			MixedLineDelimiterDetector.assertNoMixedLineDelimiters(elem);
 
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				performDummySearch();
-				if (elem instanceof IJavaProject) {
-					IJavaProject jproject= (IJavaProject) elem;
-					jproject.setRawClasspath(new IClasspathEntry[0], jproject.getProject().getFullPath(), null);
-				}
-				delete(elem.getResource());
+		IWorkspaceRunnable runnable= monitor -> {
+			performDummySearch();
+			if (elem instanceof IJavaProject) {
+				IJavaProject jproject= (IJavaProject) elem;
+				jproject.setRawClasspath(new IClasspathEntry[0], jproject.getProject().getFullPath(), null);
 			}
+			delete(elem.getResource());
 		};
 		ResourcesPlugin.getWorkspace().run(runnable, null);
 		emptyDisplayLoop();
@@ -515,15 +512,12 @@ public class JavaProjectHelper {
 	 */
 	public static void clear(final IJavaProject jproject, final IClasspathEntry[] entries) throws Exception {
 		performDummySearch();
-		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				jproject.setRawClasspath(entries, null);
-
-				for (IResource resource : jproject.getProject().members()) {
-					if (!resource.getName().startsWith(".")) {
-						delete(resource);
-					}
+		IWorkspaceRunnable runnable= monitor -> {
+			jproject.setRawClasspath(entries, null);
+
+			for (IResource resource : jproject.getProject().members()) {
+				if (!resource.getName().startsWith(".")) {
+					delete(resource);
 				}
 			}
 		};
diff --git a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/CreateStubsAction.java b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/CreateStubsAction.java
index 1537e36dc1..061deeffbe 100644
--- a/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/CreateStubsAction.java
+++ b/org.eclipse.jdt.ui.tests/test plugin/org/eclipse/jdt/testplugin/util/CreateStubsAction.java
@@ -25,7 +25,6 @@ import org.eclipse.jdt.testplugin.JavaTestPlugin;
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.resources.IFolder;
@@ -34,11 +33,9 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
@@ -136,13 +133,10 @@ public final class CreateStubsAction implements IObjectActionDelegate {
 		String initialValue= JavaTestPlugin.getDefault().getDialogSettings().get(SETTINGS_ID_STUBS_PROJECT);
 		if (initialValue == null)
 			initialValue = "stubs"; //$NON-NLS-1$
-		final InputDialog inputDialog= new InputDialog(shell, CREATE_STUBS_DIALOG_TITLE, "Target project name:", initialValue, new IInputValidator() { //$NON-NLS-1$
-					@Override
-					public String isValid(String newText) {
-						IStatus status = ResourcesPlugin.getWorkspace().validateName(newText, IResource.PROJECT);
-						return status.isOK() ? null : (String) status.getMessage();
-					}
-				});
+		final InputDialog inputDialog= new InputDialog(shell, CREATE_STUBS_DIALOG_TITLE, "Target project name:", initialValue, newText -> {
+			IStatus status = ResourcesPlugin.getWorkspace().validateName(newText, IResource.PROJECT);
+			return status.isOK() ? null : (String) status.getMessage();
+		});
 		if (inputDialog.open() != Window.OK)
 			return;
 		try {
@@ -154,40 +148,36 @@ public final class CreateStubsAction implements IObjectActionDelegate {
 			ArrayList<String> defaultPackages= new ArrayList<>(Arrays.asList(DEFAULT_PACKAGES));
 
 			ProgressMonitorDialog progressMonitorDialog= new ProgressMonitorDialog(shell);
-			progressMonitorDialog.run(true, true, new IRunnableWithProgress() {
-
-				@Override
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						createJavaProject(name);
-						IFolder target = ResourcesPlugin.getWorkspace().getRoot().getProject(inputDialog.getValue()).getFolder("src"); //$NON-NLS-1$
-						List<IPackageFragment> packageFragments= new ArrayList<>();
-
-						boolean checkCompletionOfDefaultPackages= false;
-						for (Object sel : structuredSelection.toList()) {
-							if (sel instanceof IPackageFragment) {
-								packageFragments.add((IPackageFragment) sel);
-							} else if (sel instanceof IPackageFragmentRoot) {
-								IPackageFragmentRoot root = (IPackageFragmentRoot) sel;
-								for (Iterator<String> iter= defaultPackages.iterator(); iter.hasNext();) {
-									String packName= iter.next();
-									IPackageFragment packageFragment = root.getPackageFragment(packName);
-									if (packageFragment.exists()) {
-										packageFragments.add(packageFragment);
-										iter.remove();
-									} else {
-										checkCompletionOfDefaultPackages= true;
-									}
+			progressMonitorDialog.run(true, true, monitor -> {
+				try {
+					createJavaProject(name);
+					IFolder target = ResourcesPlugin.getWorkspace().getRoot().getProject(inputDialog.getValue()).getFolder("src"); //$NON-NLS-1$
+					List<IPackageFragment> packageFragments= new ArrayList<>();
+
+					boolean checkCompletionOfDefaultPackages= false;
+					for (Object sel : structuredSelection.toList()) {
+						if (sel instanceof IPackageFragment) {
+							packageFragments.add((IPackageFragment) sel);
+						} else if (sel instanceof IPackageFragmentRoot) {
+							IPackageFragmentRoot root = (IPackageFragmentRoot) sel;
+							for (Iterator<String> iter= defaultPackages.iterator(); iter.hasNext();) {
+								String packName= iter.next();
+								IPackageFragment packageFragment = root.getPackageFragment(packName);
+								if (packageFragment.exists()) {
+									packageFragments.add(packageFragment);
+									iter.remove();
+								} else {
+									checkCompletionOfDefaultPackages= true;
 								}
 							}
 						}
-						ResourcesPlugin.getWorkspace().run(new StubCreationOperation(target.getLocationURI(), packageFragments), monitor);
-						if (!checkCompletionOfDefaultPackages) {
-							defaultPackages.clear();
-						}
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
 					}
+					ResourcesPlugin.getWorkspace().run(new StubCreationOperation(target.getLocationURI(), packageFragments), monitor);
+					if (!checkCompletionOfDefaultPackages) {
+						defaultPackages.clear();
+					}
+				} catch (CoreException e) {
+					throw new InvocationTargetException(e);
 				}
 			});
 			IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/WrappingUnitTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/WrappingUnitTest.java
index e1691c4abd..ba32c90e85 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/WrappingUnitTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/WrappingUnitTest.java
@@ -26,7 +26,6 @@ import org.eclipse.ui.PartInitException;
 
 import org.eclipse.jdt.core.JavaModelException;
 
-import org.eclipse.jdt.internal.junit.ui.ITraceDisplay;
 import org.eclipse.jdt.internal.junit.ui.TextualTrace;
 
 /**
@@ -37,12 +36,7 @@ public class WrappingUnitTest {
 	public void test00wrapSecondLine() throws Exception {
 		TextualTrace trace = new TextualTrace("12345\n1234512345",
 				new String[0]);
-		trace.display(new ITraceDisplay() {
-			@Override
-			public void addTraceLine(int lineType, String label) {
-				assertEquals("12345", label);
-			}
-		}, 5);
+		trace.display((lineType, label) -> assertEquals("12345", label), 5);
 	}
 
 	@Test
@@ -106,18 +100,15 @@ public class WrappingUnitTest {
 
 		final boolean[] done = { false };
 
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				synchronized (done) {
-					try {
-						test.waitForTableToFill(17, 50, false);
-						fail();
+		new Thread(() -> {
+			synchronized (done) {
+				try {
+					test.waitForTableToFill(17, 50, false);
+					fail();
 //					} catch (AssertionFailedError e) {
 //						done[0] = true;
-					} catch (PartInitException e) {
-						fail();// bah.
-					}
+				} catch (PartInitException e) {
+					fail();// bah.
 				}
 			}
 		}).start();
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionEnablementTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionEnablementTest.java
index 5ddb92e314..dc56d0b335 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionEnablementTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathModifierActionEnablementTest.java
@@ -115,10 +115,7 @@ public class BuildpathModifierActionEnablementTest {
     }
 
     private BuildpathModifierAction[] createActions() {
-    	ISetSelectionTarget nullSelectionTarget= new ISetSelectionTarget() {
-    		@Override
-			public void selectReveal(ISelection selection) {}
-        };
+    	ISetSelectionTarget nullSelectionTarget= selection -> {};
 
         IRunnableContext context= PlatformUI.getWorkbench().getProgressService();
 
@@ -632,12 +629,7 @@ public class BuildpathModifierActionEnablementTest {
         assertAllDisabled();
 
         final IPackageFragmentRoot[] addedZipArchive= {null};
-        AddSelectedLibraryToBuildpathAction add= new AddSelectedLibraryToBuildpathAction(PlatformUI.getWorkbench().getProgressService(), new ISetSelectionTarget() {
-			@Override
-			public void selectReveal(ISelection selection) {
-				addedZipArchive[0]= (IPackageFragmentRoot)((StructuredSelection)selection).getFirstElement();
-            }
-        });
+        AddSelectedLibraryToBuildpathAction add= new AddSelectedLibraryToBuildpathAction(PlatformUI.getWorkbench().getProgressService(), selection -> addedZipArchive[0]= (IPackageFragmentRoot)((StructuredSelection)selection).getFirstElement());
         add.selectionChanged(new SelectionChangedEvent(new ISelectionProvider() {
 			@Override
 			public void addSelectionChangedListener(ISelectionChangedListener listener) {}
@@ -698,17 +690,12 @@ public class BuildpathModifierActionEnablementTest {
         final IResource excludedElements[]= {null, null};
         final IPackageFragment pack2= root.createPackageFragment("pack1.pack2", true, null);
         final ICompilationUnit cuB= createICompilationUnit("B", pack1);
-        ExcludeFromBuildpathAction exclude= new ExcludeFromBuildpathAction(PlatformUI.getWorkbench().getProgressService(), new ISetSelectionTarget() {
-
-			@Override
-			public void selectReveal(ISelection selection) {
-				StructuredSelection ss= (StructuredSelection)selection;
-				List<?> list= ss.toList();
-				excludedElements[0]= (IResource)list.get(0);
-				excludedElements[1]= (IResource)list.get(1);
-            }
-
-        });
+        ExcludeFromBuildpathAction exclude= new ExcludeFromBuildpathAction(PlatformUI.getWorkbench().getProgressService(), selection -> {
+			StructuredSelection ss= (StructuredSelection)selection;
+			List<?> list= ss.toList();
+			excludedElements[0]= (IResource)list.get(0);
+			excludedElements[1]= (IResource)list.get(1);
+		});
         exclude.selectionChanged(new SelectionChangedEvent(new ISelectionProvider() {
 			@Override
 			public void addSelectionChangedListener(ISelectionChangedListener listener) {}
@@ -725,14 +712,7 @@ public class BuildpathModifierActionEnablementTest {
         file.create(null, false, null);
 
         final IFile[] removedZipFile= {null};
-        RemoveFromBuildpathAction remove= new RemoveFromBuildpathAction(PlatformUI.getWorkbench().getProgressService(), new ISetSelectionTarget() {
-
-			@Override
-			public void selectReveal(ISelection selection) {
-				removedZipFile[0]= (IFile)((StructuredSelection)selection).getFirstElement();
-            }
-
-        });
+        RemoveFromBuildpathAction remove= new RemoveFromBuildpathAction(PlatformUI.getWorkbench().getProgressService(), selection -> removedZipFile[0]= (IFile)((StructuredSelection)selection).getFirstElement());
         remove.selectionChanged(new SelectionChangedEvent(new ISelectionProvider() {
 			@Override
 			public void addSelectionChangedListener(ISelectionChangedListener listener) {}
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java
index 84f6bfa23b..83f831b77f 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/ImportOrganizeTest.java
@@ -43,7 +43,6 @@ import org.eclipse.jdt.core.IImportDeclaration;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.ISourceRange;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
@@ -78,30 +77,27 @@ public class ImportOrganizeTest extends CoreTests {
 	}
 
 	protected IChooseImportQuery createQuery(final String name, final String[] choices, final int[] nEntries) {
-		return new IChooseImportQuery() {
-			@Override
-			public TypeNameMatch[] chooseImports(TypeNameMatch[][] openChoices, ISourceRange[] ranges) {
-				assertEquals(name + "-query-nchoices1", choices.length, openChoices.length);
-				assertEquals(name + "-query-nchoices2", nEntries.length, openChoices.length);
-				for (int i= 0; i < nEntries.length; i++) {
-					assertEquals(name + "-query-cnt" + i, openChoices[i].length, nEntries[i]);
-				}
-				TypeNameMatch[] res= new TypeNameMatch[openChoices.length];
-				for (int i= 0; i < openChoices.length; i++) {
-					TypeNameMatch[] selection= openChoices[i];
-					assertNotNull(name + "-query-setset" + i, selection);
-					assertTrue(name + "-query-setlen" + i, selection.length > 0);
-					TypeNameMatch found= null;
-					for (TypeNameMatch s : selection) {
-						if (s.getFullyQualifiedName().equals(choices[i])) {
-							found= s;
-						}
+		return (openChoices, ranges) -> {
+			assertEquals(name + "-query-nchoices1", choices.length, openChoices.length);
+			assertEquals(name + "-query-nchoices2", nEntries.length, openChoices.length);
+			for (int i1= 0; i1 < nEntries.length; i1++) {
+				assertEquals(name + "-query-cnt" + i1, openChoices[i1].length, nEntries[i1]);
+			}
+			TypeNameMatch[] res= new TypeNameMatch[openChoices.length];
+			for (int i2= 0; i2 < openChoices.length; i2++) {
+				TypeNameMatch[] selection= openChoices[i2];
+				assertNotNull(name + "-query-setset" + i2, selection);
+				assertTrue(name + "-query-setlen" + i2, selection.length > 0);
+				TypeNameMatch found= null;
+				for (TypeNameMatch s : selection) {
+					if (s.getFullyQualifiedName().equals(choices[i2])) {
+						found= s;
 					}
-					assertNotNull(name + "-query-notfound" + i, found);
-					res[i]= found;
 				}
-				return res;
+				assertNotNull(name + "-query-notfound" + i2, found);
+				res[i2]= found;
 			}
+			return res;
 		};
 	}
 
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java
index 0c7dccb901..6b82ea9743 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/TypeHierarchyTest.java
@@ -33,7 +33,6 @@ import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.ITypeHierarchyChangedListener;
 import org.eclipse.jdt.core.manipulation.SharedASTProviderCore;
 
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
@@ -104,12 +103,7 @@ public class TypeHierarchyTest {
 		final int[] updateCount= new int[] {0};
 
 		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			@Override
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
+		hierarchy.addTypeHierarchyChangedListener(typeHierarchy -> updateCount[0]++);
 
 		IType[] allTypes= hierarchy.getAllTypes();
 
@@ -174,12 +168,7 @@ public class TypeHierarchyTest {
 
 		// create on type in working copy
 		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			@Override
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
+		hierarchy.addTypeHierarchyChangedListener(typeHierarchy -> updateCount[0]++);
 
 		IType[] allTypes= hierarchy.getAllTypes();
 
@@ -244,12 +233,7 @@ public class TypeHierarchyTest {
 
 		// create on type in primary working copy
 		ITypeHierarchy hierarchy= type2.newSupertypeHierarchy(null);
-		hierarchy.addTypeHierarchyChangedListener(new ITypeHierarchyChangedListener() {
-			@Override
-			public void typeHierarchyChanged(ITypeHierarchy typeHierarchy) {
-				updateCount[0]++;
-			}
-		});
+		hierarchy.addTypeHierarchyChangedListener(typeHierarchy -> updateCount[0]++);
 
 		IType[] allTypes= hierarchy.getAllTypes();
 
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest.java
index 842a4eb633..a6f5762bcf 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest.java
@@ -83,13 +83,7 @@ public class GenerateGettersSettersTest extends SourceTestCase {
 	 */
 	private void runOperation(IType type, IField[] getters, IField[] setters, IField[] gettersAndSetters, boolean sort, int visibility, IJavaElement sibling) throws CoreException {
 
-		IRequestQuery allYes= new IRequestQuery() {
-
-			@Override
-			public int doQuery(IMember member) {
-				return IRequestQuery.YES_ALL;
-			}
-		};
+		IRequestQuery allYes= member -> IRequestQuery.YES_ALL;
 
 		RefactoringASTParser parser= new RefactoringASTParser(IASTSharedValues.SHARED_AST_LEVEL);
 		CompilationUnit unit= parser.parse(type.getCompilationUnit(), true);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest14.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest14.java
index 94a80e5c9d..47c322e43c 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest14.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/GenerateGettersSettersTest14.java
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 
 import org.eclipse.jdt.core.IField;
 import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.Modifier;
@@ -61,13 +60,7 @@ public class GenerateGettersSettersTest14 extends SourceTestCase14 {
 	 */
 	private void runOperation(IType type, IField[] getters, IField[] setters, IField[] gettersAndSetters, boolean sort, int visibility, IJavaElement sibling) throws CoreException {
 
-		IRequestQuery allYes= new IRequestQuery() {
-
-			@Override
-			public int doQuery(IMember member) {
-				return IRequestQuery.YES_ALL;
-			}
-		};
+		IRequestQuery allYes= member -> IRequestQuery.YES_ALL;
 
 		RefactoringASTParser parser= new RefactoringASTParser(IASTSharedValues.SHARED_AST_LEVEL);
 		CompilationUnit unit= parser.parse(type.getCompilationUnit(), true);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java
index e4cffc5769..20324dff0d 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AnnotateAssistTest1d5.java
@@ -47,11 +47,8 @@ import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 
-import org.eclipse.jdt.internal.compiler.CompilationResult;
-
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.tests.core.rules.ProjectTestSetup;
-import org.eclipse.jdt.ui.tests.quickfix.JarUtil.ClassFileFilter;
 
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
@@ -639,12 +636,7 @@ public class AnnotateAssistTest1d5 extends AbstractAnnotateAssistTests {
 					"}\n"
 				};
 
-		addLibrary(fJProject1, "lib.jar", "lib.zip", pathAndContents, ANNOTATION_PATH, JavaCore.VERSION_1_5, new ClassFileFilter() {
-			@Override
-			public boolean include(CompilationResult unitResult) {
-				return !new Path(MISSINGPATH + ".java").equals(new Path(String.valueOf(unitResult.getFileName())));
-			}
-		});
+		addLibrary(fJProject1, "lib.jar", "lib.zip", pathAndContents, ANNOTATION_PATH, JavaCore.VERSION_1_5, unitResult -> !new Path(MISSINGPATH + ".java").equals(new Path(String.valueOf(unitResult.getFileName()))));
 		IType type= fJProject1.findType(CLASS2_PATH.replace('/', '.'));
 		JavaEditor javaEditor= (JavaEditor) JavaUI.openInEditor(type);
 
@@ -655,16 +647,13 @@ public class AnnotateAssistTest1d5 extends AbstractAnnotateAssistTests {
 
 			// Not expecting proposals, but a log message, due to incomplete AST (no binding information available).
 			final IStatus[] resultingStatus= new IStatus[1];
-			logListener= new ILogListener() {
-				@Override
-				public void logging(IStatus status, String plugin) {
-					assertNull("Only one status", resultingStatus[0]);
-					assertEquals("Expected status message",
-							"Error during computation of Annotate proposals: " +
-									"Could not resolve type Missing",
-							status.getMessage());
-					resultingStatus[0]= status;
-				}
+			logListener= (status, plugin) -> {
+				assertNull("Only one status", resultingStatus[0]);
+				assertEquals("Expected status message",
+						"Error during computation of Annotate proposals: " +
+								"Could not resolve type Missing",
+						status.getMessage());
+				resultingStatus[0]= status;
 			};
 			log.log(new Status(IStatus.INFO, JavaUI.ID_PLUGIN, "Expecting an error message to be logged after this."));
 			log.addLogListener(logListener);
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
index 609189177a..fe6370b462 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/JarUtil.java
@@ -174,12 +174,7 @@ private static class Requestor implements ICompilerRequestor {
 			this.classFileFilter = classFileFilter;
 		} else {
 			// default: all without errors
-			this.classFileFilter = new ClassFileFilter() {
-				@Override
-				public boolean include(CompilationResult unitResult) {
-					return (unitResult != null) && !unitResult.hasErrors();
-				}
-			};
+			this.classFileFilter = unitResult -> (unitResult != null) && !unitResult.hasErrors();
 		}
 	}
 
@@ -385,12 +380,7 @@ public static String[] getJavaClassLibs() {
 		String[] jarsNames = null;
 		ArrayList<String> paths = new ArrayList<>();
 		if ("DRLVM".equals(vmName)) {
-			FilenameFilter jarFilter = new FilenameFilter() {
-				@Override
-				public boolean accept(File dir, String name) {
-					return name.endsWith(".jar") & !name.endsWith("-src.jar");
-				}
-			};
+			FilenameFilter jarFilter = (dir, name) -> name.endsWith(".jar") & !name.endsWith("-src.jar");
 			jarsNames = new File(jreDir + "/lib/boot/").list(jarFilter);
 			addJarEntries(jreDir + "/lib/boot/", jarsNames, paths);
 		} else {