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

Re-running the cleanup on org.eclipse.jdt.astview
org.eclipse.jdt.jeview
org.eclipse.jdt.junit
org.eclipse.jdt.junit.core results in multiple method references instead
of lambdas.


Change-Id: Iae0a4b880b0c15c804a71e94deafaaa090c41fcf

9 files changed, 14 insertions, 18 deletions

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
index 66bd64917b..85a804517d 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
@@ -890,7 +890,7 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 	private void hookContextMenu() {
 		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(manager -> fillContextMenu(manager));
+		menuMgr.addMenuListener(this::fillContextMenu);
 		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
 		fViewer.getControl().setMenu(menu);
 		getSite().registerContextMenu(menuMgr, fViewer);
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
index 7f83c566b9..46e71feae7 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
@@ -317,7 +317,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 	private void hookContextMenu() {
 		MenuManager menuMgr = new MenuManager("#PopupMenu");
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(manager -> fillContextMenu(manager));
+		menuMgr.addMenuListener(this::fillContextMenu);
 		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
 		fViewer.getControl().setMenu(menu);
 		getSite().registerContextMenu(menuMgr, fViewer);
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
index 29c3ea725b..0412ae5958 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/TestKindRegistry.java
@@ -17,7 +17,6 @@ package org.eclipse.jdt.internal.junit.launcher;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -73,15 +72,12 @@ public class TestKindRegistry {
 			items.add(new TestKind(configurationElement));
 		}
 
-		Collections.sort(items, new Comparator<TestKind>() {
-			@Override
-			public int compare(TestKind kind0, TestKind kind1) {
-				if (kind0.precedes(kind1))
-					return -1;
-				if (kind1.precedes(kind0))
-					return 1;
-				return 0;
-			}
+		Collections.sort(items, (kind0, kind1) -> {
+			if (kind0.precedes(kind1))
+				return -1;
+			if (kind1.precedes(kind0))
+				return 1;
+			return 0;
 		});
 		fTestKinds= items;
 	}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
index cc0c5d352e..d167516212 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
@@ -572,7 +572,7 @@ public class TestRunSession implements ITestRunSession {
 	public TestElement createTestElement(TestSuiteElement parent, String id, String testName, boolean isSuite, int testCount, boolean isDynamicTest, String displayName, String[] parameterTypes, String uniqueId) {
 		TestElement testElement;
 		if (parameterTypes != null && parameterTypes.length > 1) {
-			parameterTypes= Arrays.stream(parameterTypes).map(t -> t.trim()).toArray(String[]::new);
+			parameterTypes= Arrays.stream(parameterTypes).map(String::trim).toArray(String[]::new);
 		}
 		if (isSuite) {
 			TestSuiteElement testSuiteElement= new TestSuiteElement(parent, id, testName, testCount, displayName, parameterTypes, uniqueId);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
index a8a04eb0e0..afed931752 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/launcher/JUnitLaunchIncludeExcludeTagsDialog.java
@@ -50,7 +50,7 @@ public class JUnitLaunchIncludeExcludeTagsDialog extends StatusDialog {
 
 	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
 
-	IDialogFieldListener fListener= field -> doDialogFieldChanged(field);
+	IDialogFieldListener fListener= this::doDialogFieldChanged;
 
 	public JUnitLaunchIncludeExcludeTagsDialog(Shell parent, ILaunchConfiguration config) {
 		super(parent);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
index 3d2fe13d37..7b78ed6ac2 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
@@ -345,7 +345,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 	}
 
 	public static void asyncShowTestRunnerViewPart() {
-		getDisplay().asyncExec(() -> showTestRunnerViewPartInActivePage());
+		getDisplay().asyncExec(JUnitPlugin::showTestRunnerViewPartInActivePage);
 	}
 
 	public static TestRunnerViewPart showTestRunnerViewPartInActivePage() {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
index dc566ee894..72478c9ed3 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitProgressBar.java
@@ -52,7 +52,7 @@ public class JUnitProgressBar extends Canvas {
 				redraw();
 			}
 		});
-		addPaintListener(event -> paint(event));
+		addPaintListener(this::paint);
 		addDisposeListener(event -> {
 			fFailureColor.dispose();
 			fOKColor.dispose();
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
index 4ebe78a73f..8d9cf9153a 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
@@ -264,7 +264,7 @@ public class TestViewer {
 	private void initContextMenu() {
 		MenuManager menuMgr= new MenuManager("#PopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(manager -> handleMenuAboutToShow(manager));
+		menuMgr.addMenuListener(this::handleMenuAboutToShow);
 		fTestRunnerPart.getSite().registerContextMenu(menuMgr, fSelectionProvider);
 		Menu menu= menuMgr.createContextMenu(fViewerbook);
 		fTreeViewer.getTree().setMenu(menu);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
index 4a1d60ff4a..76b16dfbc2 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java
@@ -157,7 +157,7 @@ public class CheckedTableSelectionDialog extends SelectionStatusDialog {
 	@Override
 	public int open() {
 		fIsEmpty= evaluateIfTableEmpty(fInput);
-		BusyIndicator.showWhile(null, () -> access$superOpen());
+		BusyIndicator.showWhile(null, this::access$superOpen);
 		return getReturnCode();
 	}