Bug 521038 - [refactoring] Replace anonymous Runnable classes by lambda

expression

Changed some formatters to Eclipse so there is some formatting happening
as the debug one is not clear where to get from and it's unrealistic to
expect random contributors to do it.

Change-Id: I731410854f9a4ac0c9fc18bcf3ad3dcf7d941c9a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

4 files changed, 60 insertions, 99 deletions

diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
index 5ae877f15..fd1d2402d 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java
@@ -23,8 +23,6 @@ import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
@@ -145,21 +143,18 @@ public class ConsoleManagerTests extends AbstractDebugTest {
 	}
 
 	private void showConsole(final ConsoleMock console) {
-		executorService.execute(new Runnable() {
-			@Override
-			public void run() {
-				// last one arriving here triggers execution for all at same
-				// time
-				latch.countDown();
-				try {
-					latch.await(1, TimeUnit.MINUTES);
-					System.out.println("Requesting to show: " + console); //$NON-NLS-1$
-					manager.showConsoleView(console);
-					TestUtil.waitForJobs(getName(), 200, 5000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-					Thread.interrupted();
-				}
+		executorService.execute(() -> {
+			// last one arriving here triggers execution for all at same
+			// time
+			latch.countDown();
+			try {
+				latch.await(1, TimeUnit.MINUTES);
+				System.out.println("Requesting to show: " + console); //$NON-NLS-1$
+				manager.showConsoleView(console);
+				TestUtil.waitForJobs(getName(), 200, 5000);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+				Thread.interrupted();
 			}
 		});
 	}
@@ -213,14 +208,11 @@ public class ConsoleManagerTests extends AbstractDebugTest {
 					super.createControl(parent);
 					// This listener is get called if the page is really shown
 					// in the console view
-					getControl().addListener(SWT.Show, new Listener() {
-						@Override
-						public void handleEvent(Event event) {
-							int count = showCalled.incrementAndGet();
-							if (count == 1) {
-								count = allShownConsoles.incrementAndGet();
-								System.out.println("Shown: " + ConsoleMock.this + ", overall: " + count); //$NON-NLS-1$ //$NON-NLS-2$
-							}
+					getControl().addListener(SWT.Show, event -> {
+						int count = showCalled.incrementAndGet();
+						if (count == 1) {
+							count = allShownConsoles.incrementAndGet();
+							System.out.println("Shown: " + ConsoleMock.this + ", overall: " + count); //$NON-NLS-1$ //$NON-NLS-2$
 						}
 					});
 				}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
index 049055549..caa5a3972 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java
@@ -514,29 +514,23 @@ public class ExpressionManagerTests extends AbstractDebugTest {
 	public void testConcurrentAccess() throws InterruptedException {
 		final boolean[] done = new boolean[]{false};
 		final Exception[] ex = new Exception[]{null};
-		Runnable add = new Runnable() {
-			@Override
-			public void run() {
-				try {
-					for (int i = 0; i < 1000; i++) {
-						getManager().addExpression(getManager().newWatchExpression(Integer.toHexString(i)));
-					}
-					done[0] = true;
-				} catch (Exception e) {
-					ex[0] = e;
+		Runnable add = () -> {
+			try {
+				for (int i = 0; i < 1000; i++) {
+					getManager().addExpression(getManager().newWatchExpression(Integer.toHexString(i)));
 				}
+				done[0] = true;
+			} catch (Exception e) {
+				ex[0] = e;
 			}
 		};
-		Runnable remove = new Runnable() {
-			@Override
-			public void run() {
-				try {
-					do {
-						getManager().removeExpressions(getManager().getExpressions());
-					} while (!done[0] || getManager().getExpressions().length > 0);
-				} catch (Exception e) {
-					ex[0] = e;
-				}
+		Runnable remove = () -> {
+			try {
+				do {
+					getManager().removeExpressions(getManager().getExpressions());
+				} while (!done[0] || getManager().getExpressions().length > 0);
+			} catch (Exception e) {
+				ex[0] = e;
 			}
 		};
 		Thread t1 = new Thread(add);
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
index 2e50be204..f9727fda8 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Andrey Loskutov.
+ * Copyright (c) 2016, 2018 Andrey Loskutov.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
 package org.eclipse.debug.tests.launching;
 
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ConcurrentModificationException;
 import java.util.concurrent.Semaphore;
@@ -53,61 +52,42 @@ public class LaunchTests extends AbstractLaunchTest {
 		super.setUp();
 		final Launch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
 
-		handler = new InvocationHandler() {
-			@Override
-			public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-				String name = method.getName();
-				if (name.equals("equals")) { //$NON-NLS-1$
-					return args.length == 1 && proxy == args[0];
-				}
-				return Boolean.TRUE;
+		handler = (proxy, method, args) -> {
+			String name = method.getName();
+			if (name.equals("equals")) { //$NON-NLS-1$
+				return args.length == 1 && proxy == args[0];
 			}
+			return Boolean.TRUE;
 		};
 
-		readIsTerminatedTask = new Runnable() {
-			@Override
-			public void run() {
-				launch.isTerminated();
-			}
-		};
+		readIsTerminatedTask = () -> launch.isTerminated();
 
-		readIsDisconnectedTask = new Runnable() {
-			@Override
-			public void run() {
-				launch.isDisconnected();
-			}
-		};
+		readIsDisconnectedTask = () -> launch.isDisconnected();
 
-		writeProcessesTask = new Runnable() {
-			@Override
-			public void run() {
-				IProcess process = createProcessProxy();
-				launch.addProcess(process);
-				launch.removeProcess(process);
-				try {
-					Thread.sleep(0, 1);
-				} catch (InterruptedException e) {
-					//
-				}
-				launch.addProcess(process);
-				launch.removeProcess(process);
+		writeProcessesTask = () -> {
+			IProcess process = createProcessProxy();
+			launch.addProcess(process);
+			launch.removeProcess(process);
+			try {
+				Thread.sleep(0, 1);
+			} catch (InterruptedException e) {
+				//
 			}
+			launch.addProcess(process);
+			launch.removeProcess(process);
 		};
 
-		writeDebugTargetsTask = new Runnable() {
-			@Override
-			public void run() {
-				IDebugTarget target2 = createDebugTargetProxy();
-				launch.addDebugTarget(target2);
-				launch.removeDebugTarget(target2);
-				try {
-					Thread.sleep(0, 1);
-				} catch (InterruptedException e) {
-					//
-				}
-				launch.addDebugTarget(target2);
-				launch.removeDebugTarget(target2);
+		writeDebugTargetsTask = () -> {
+			IDebugTarget target2 = createDebugTargetProxy();
+			launch.addDebugTarget(target2);
+			launch.removeDebugTarget(target2);
+			try {
+				Thread.sleep(0, 1);
+			} catch (InterruptedException e) {
+				//
 			}
+			launch.addDebugTarget(target2);
+			launch.removeDebugTarget(target2);
 		};
 	}
 
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
index fedfbc9fe..feb73bbb6 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
@@ -274,12 +274,7 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider
         if (fQueueingUpdates) {
             fQueuedUpdates.addAll(Arrays.asList(updates));
         } else if (fDelayUpdates) {
-        	Display.getDefault().asyncExec(new Runnable() {
-        		@Override
-				public void run() {
-        			processUpdates(updates);
-        		}
-        	});
+			Display.getDefault().asyncExec(() -> processUpdates(updates));
         } else {
 			processUpdates(updates);
         }