Convert new Runnable to lambda.

Take 2.

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

4 files changed, 46 insertions, 91 deletions

diff --git a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
index 0fa8841eb32..6edb118246f 100644
--- a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
+++ b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.cdt.examples.dsf;singleton:=true
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.2.100.qualifier
 Bundle-Activator: org.eclipse.cdt.examples.dsf.DsfExamplesPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserVMProvider.java b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserVMProvider.java
index cff346d7c9a..e018d1a42e9 100644
--- a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserVMProvider.java
+++ b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserVMProvider.java
@@ -89,13 +89,10 @@ public class FileBrowserVMProvider extends AbstractVMProvider {
 		// We're in the UI thread.  Re-dispach to VM Adapter executor thread
 		// and then call root layout node.
 		try {
-			getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					if (isDisposed())
-						return;
-					handleEvent(text);
-				}
+			getExecutor().execute(() -> {
+				if (isDisposed())
+					return;
+				handleEvent(text);
 			});
 		} catch (RejectedExecutionException e) {
 			// Ignore.  This exception could be thrown if the provider is being
diff --git a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMProvider.java b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMProvider.java
index e6c29cba1ba..237aca3e32d 100644
--- a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMProvider.java
+++ b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMProvider.java
@@ -56,13 +56,10 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 
 		// Add ourselves as listener for DM events events.
 		try {
-			session.getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					if (DsfSession.isSessionActive(getSession().getId())) {
-						getSession().addServiceEventListener(TimersVMProvider.this, null);
-						fRegisteredEventListener = true;
-					}
+			session.getExecutor().execute(() -> {
+				if (DsfSession.isSessionActive(getSession().getId())) {
+					getSession().addServiceEventListener(TimersVMProvider.this, null);
+					fRegisteredEventListener = true;
 				}
 			});
 		} catch (RejectedExecutionException e) {
@@ -83,13 +80,10 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 		// RejectedExecutionException. We put this here all the same for
 		// completeness sake.
 		try {
-			getSession().getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					if (fRegisteredEventListener && DsfSession.isSessionActive(getSession().getId())) {
-						getSession().removeServiceEventListener(TimersVMProvider.this);
-						fRegisteredEventListener = false;
-					}
+			getSession().getExecutor().execute(() -> {
+				if (fRegisteredEventListener && DsfSession.isSessionActive(getSession().getId())) {
+					getSession().removeServiceEventListener(TimersVMProvider.this);
+					fRegisteredEventListener = false;
 				}
 			});
 		} catch (RejectedExecutionException e) {
@@ -148,13 +142,10 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 			return;
 
 		try {
-			getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					if (isDisposed())
-						return;
-					handleEvent(event);
-				}
+			getExecutor().execute(() -> {
+				if (isDisposed())
+					return;
+				handleEvent(event);
 			});
 		} catch (RejectedExecutionException e) {
 		}
@@ -166,13 +157,10 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 			return;
 
 		try {
-			getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					if (isDisposed())
-						return;
-					handleEvent(event);
-				}
+			getExecutor().execute(() -> {
+				if (isDisposed())
+					return;
+				handleEvent(event);
 			});
 		} catch (RejectedExecutionException e) {
 		}
diff --git a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersView.java b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersView.java
index 6671f634105..8aab054e129 100644
--- a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersView.java
+++ b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersView.java
@@ -35,7 +35,6 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -165,13 +164,10 @@ public class TimersView extends ViewPart {
 			// First dispose the view model, which is the client of services.
 			// This operation needs to be performed in the session executor
 			// thread.  Block using Future.get() until this call completes.
-			fSession.getExecutor().submit(new Runnable() {
-				@Override
-				public void run() {
-					fSession.unregisterModelAdapter(IElementContentProvider.class);
-					fSession.unregisterModelAdapter(IModelProxyFactory.class);
-					fSession.unregisterModelAdapter(IColumnPresentationFactory.class);
-				}
+			fSession.getExecutor().submit(() -> {
+				fSession.unregisterModelAdapter(IElementContentProvider.class);
+				fSession.unregisterModelAdapter(IModelProxyFactory.class);
+				fSession.unregisterModelAdapter(IColumnPresentationFactory.class);
 			}).get();
 
 			// Dispose the VM adapter.
@@ -191,14 +187,11 @@ public class TimersView extends ViewPart {
 			}
 
 			// Finally end the session and the executor.
-			fSession.getExecutor().submit(new Runnable() {
-				@Override
-				public void run() {
-					DsfSession.endSession(fSession);
-					fSession = null;
-					fExecutor.shutdown();
-					fExecutor = null;
-				}
+			fSession.getExecutor().submit(() -> {
+				DsfSession.endSession(fSession);
+				fSession = null;
+				fExecutor.shutdown();
+				fExecutor = null;
 			}).get();
 		} catch (InterruptedException e) {
 		} catch (ExecutionException e) {
@@ -237,14 +230,8 @@ public class TimersView extends ViewPart {
 		fAddTimerAction = new Action("Add New Timer") {
 			@Override
 			public void run() {
-				fExecutor.execute(new Runnable() {
-					@Override
-					public void run() {
-						// Only need to create the new timer, the events will
-						// cause the view to refresh.
-						fServices.getService(TimerService.class).startTimer();
-					}
-				});
+				// Only need to create the new timer, the events will cause the view to refresh.
+				fExecutor.execute(() -> fServices.getService(TimerService.class).startTimer());
 			}
 		};
 		fAddTimerAction.setToolTipText("Add a new timer");
@@ -255,19 +242,16 @@ public class TimersView extends ViewPart {
 			public void run() {
 				// Ask user for the new trigger value.
 				InputDialog inputDialog = new InputDialog(getSite().getShell(), "New Trigger",
-						"Please enter trigger value", "", new IInputValidator() {
-							@Override
-							public String isValid(String input) {
-								try {
-									int i = Integer.parseInt(input);
-									if (i <= 0)
-										return "Please enter a positive integer";
-
-								} catch (NumberFormatException x) {
+						"Please enter trigger value", "", input -> {
+							try {
+								int i = Integer.parseInt(input);
+								if (i <= 0)
 									return "Please enter a positive integer";
-								}
-								return null;
+
+							} catch (NumberFormatException x) {
+								return "Please enter a positive integer";
 							}
+							return null;
 						});
 				if (inputDialog.open() != Window.OK)
 					return;
@@ -278,13 +262,8 @@ public class TimersView extends ViewPart {
 					assert false;
 				}
 				final int triggerValue = tmpTriggerValue;
-				fExecutor.execute(new Runnable() {
-					@Override
-					public void run() {
-						// Create the new trigger
-						fServices.getService(AlarmService.class).createTrigger(triggerValue);
-					}
-				});
+				// Create the new trigger
+				fExecutor.execute(() -> fServices.getService(AlarmService.class).createTrigger(triggerValue));
 			}
 		};
 		fAddTriggerAction.setToolTipText("Add a new trigger");
@@ -300,20 +279,11 @@ public class TimersView extends ViewPart {
 				// Based on the context from the selection, call the
 				// appropriate service to remove the item.
 				if (selectedCtx instanceof TimerDMContext) {
-					fExecutor.execute(new Runnable() {
-						@Override
-						public void run() {
-							fServices.getService(TimerService.class).killTimer(((TimerDMContext) selectedCtx));
-						}
-					});
+					fExecutor.execute(
+							() -> fServices.getService(TimerService.class).killTimer(((TimerDMContext) selectedCtx)));
 				} else if (selectedCtx instanceof AlarmService.TriggerDMContext) {
-					fExecutor.execute(new Runnable() {
-						@Override
-						public void run() {
-							fServices.getService(AlarmService.class)
-									.deleteTrigger((AlarmService.TriggerDMContext) selectedCtx);
-						}
-					});
+					fExecutor.execute(() -> fServices.getService(AlarmService.class)
+							.deleteTrigger((AlarmService.TriggerDMContext) selectedCtx));
 				}
 			}
 		};