Convert new Runnable to lambda.

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

13 files changed, 161 insertions, 234 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
index 8b90b032603..e979d05e960 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
@@ -95,12 +95,7 @@ public class GdbPinProvider implements IPinProvider {
 	public GdbPinProvider(DsfSession session) {
 		fSession = session;
 
-		session.getExecutor().execute(new Runnable() {
-			@Override
-			public void run() {
-				fSession.addServiceEventListener(GdbPinProvider.this, null);
-			}
-		});
+		session.getExecutor().execute(() -> fSession.addServiceEventListener(GdbPinProvider.this, null));
 	}
 
 	/**
@@ -108,12 +103,7 @@ public class GdbPinProvider implements IPinProvider {
 	 */
 	public void dispose() {
 		try {
-			fSession.getExecutor().execute(new Runnable() {
-				@Override
-				public void run() {
-					fSession.removeServiceEventListener(GdbPinProvider.this);
-				}
-			});
+			fSession.getExecutor().execute(() -> fSession.removeServiceEventListener(GdbPinProvider.this));
 		} catch (RejectedExecutionException e) {
 			// Session already gone.
 		}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbStatusHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbStatusHandler.java
index de5cd3c62a5..f73d6257e38 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbStatusHandler.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbStatusHandler.java
@@ -30,35 +30,22 @@ public class GdbStatusHandler implements IStatusHandler {
 	public Object handleStatus(final IStatus status, Object source) throws CoreException {
 		Runnable runnable = null;
 		if (status.getSeverity() == IStatus.ERROR) {
-			runnable = new Runnable() {
-
-				@Override
-				public void run() {
-					Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
-					if (parent != null)
-						MessageDialog.openError(parent, Messages.GdbStatusHandler_Error, status.getMessage());
-				}
+			runnable = () -> {
+				Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
+				if (parent != null)
+					MessageDialog.openError(parent, Messages.GdbStatusHandler_Error, status.getMessage());
 			};
 		} else if (status.getSeverity() == IStatus.WARNING) {
-			runnable = new Runnable() {
-
-				@Override
-				public void run() {
-					Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
-					if (parent != null)
-						MessageDialog.openWarning(parent, Messages.GdbStatusHandler_Warning, status.getMessage());
-				}
+			runnable = () -> {
+				Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
+				if (parent != null)
+					MessageDialog.openWarning(parent, Messages.GdbStatusHandler_Warning, status.getMessage());
 			};
 		} else if (status.getSeverity() == IStatus.INFO) {
-			runnable = new Runnable() {
-
-				@Override
-				public void run() {
-					Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
-					if (parent != null)
-						MessageDialog.openInformation(parent, Messages.GdbStatusHandler_Information,
-								status.getMessage());
-				}
+			runnable = () -> {
+				Shell parent = GdbUIPlugin.getActiveWorkbenchShell();
+				if (parent != null)
+					MessageDialog.openInformation(parent, Messages.GdbStatusHandler_Information, status.getMessage());
 			};
 		}
 		if (runnable != null)
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
index a5e172ebf4d..1125346943b 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
@@ -212,23 +212,20 @@ public class DsfTerminateCommand implements ITerminateHandler {
 		// session is also terminated before the timeout).
 		// We haven't found a problem with delaying the completion
 		// of the request that way.
-		fFutureWrapper.fFuture = fExecutor.schedule(new Runnable() {
-			@Override
-			public void run() {
-				// Check that the session is still active when the timeout hits.
-				// If it is not, then everything has been cleaned up already.
-				if (DsfSession.isSessionActive(fSession.getId())) {
-					DsfSession.removeSessionEndedListener(endedListener);
+		fFutureWrapper.fFuture = fExecutor.schedule(() -> {
+			// Check that the session is still active when the timeout hits.
+			// If it is not, then everything has been cleaned up already.
+			if (DsfSession.isSessionActive(fSession.getId())) {
+				DsfSession.removeSessionEndedListener(endedListener);
 
-					// Marking the request as cancelled will prevent the removal of
-					// the launch from the Debug view in case of "Terminate and Remove".
-					// This is important for multi-process sessions when "Terminate and Remove"
-					// is applied to one of the running processes. In this case the selected
-					// process will be terminated but the associated launch will not be removed
-					// from the Debug view.
-					request.setStatus(Status.CANCEL_STATUS);
-					request.done();
-				}
+				// Marking the request as cancelled will prevent the removal of
+				// the launch from the Debug view in case of "Terminate and Remove".
+				// This is important for multi-process sessions when "Terminate and Remove"
+				// is applied to one of the running processes. In this case the selected
+				// process will be terminated but the associated launch will not be removed
+				// from the Debug view.
+				request.setStatus(Status.CANCEL_STATUS);
+				request.done();
 			}
 		}, 1, TimeUnit.MINUTES);
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
index 4532112d119..ac97a377571 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
@@ -161,23 +161,20 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
 		// need it anymore, once the session has terminated;
 		// instead, we let it timeout and ignore it if the session
 		// is already terminated.
-		fExecutor.schedule(new Runnable() {
-			@Override
-			public void run() {
-				// Check that the session is still active when the timeout hits.
-				// If it is not, then everything has been cleaned up already.
-				if (DsfSession.isSessionActive(fSession.getId())) {
-					DsfSession.removeSessionEndedListener(endedListener);
+		fExecutor.schedule(() -> {
+			// Check that the session is still active when the timeout hits.
+			// If it is not, then everything has been cleaned up already.
+			if (DsfSession.isSessionActive(fSession.getId())) {
+				DsfSession.removeSessionEndedListener(endedListener);
 
-					// Marking the request as cancelled will prevent the removal of
-					// the launch from the Debug view in case of "Terminate and Remove".
-					// This is important for multi-process sessions when "Terminate and Remove"
-					// is applied to one of the running processes. In this case the selected
-					// process will be terminated but the associated launch will not be removed
-					// from the Debug view.
-					request.setStatus(Status.CANCEL_STATUS);
-					request.done();
-				}
+				// Marking the request as cancelled will prevent the removal of
+				// the launch from the Debug view in case of "Terminate and Remove".
+				// This is important for multi-process sessions when "Terminate and Remove"
+				// is applied to one of the running processes. In this case the selected
+				// process will be terminated but the associated launch will not be removed
+				// from the Debug view.
+				request.setStatus(Status.CANCEL_STATUS);
+				request.done();
 			}
 		}, 1, TimeUnit.MINUTES);
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
index 0eb5c815633..ed908246f2b 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
@@ -71,12 +71,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
 		}
 
 		final String[] fileName = new String[1];
-		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				fileName[0] = promptForFileName();
-			}
-		});
+		PlatformUI.getWorkbench().getDisplay().syncExec(() -> fileName[0] = promptForFileName());
 
 		if (fileName[0] != null) {
 			Query<Object> saveTraceDataQuery = new Query<Object>() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
index c10b7fd3c7c..61366a3ef9a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbFullCliConsolePage.java
@@ -175,17 +175,14 @@ public class GdbFullCliConsolePage extends Page implements IDebugContextListener
 
 		// Must use syncExec because the logic within must complete before the rest
 		// of the class methods (specifically getProcess()) is called
-		fMainComposite.getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				if (fTerminalControl != null && !fTerminalControl.isDisposed()) {
-					fTerminalControl.clearTerminal();
-					fTerminalControl.connectTerminal();
-
-					// The actual terminal widget initializes its defaults in the line above,
-					// lets override them with our application defaults right after.
-					setDefaults();
-				}
+		fMainComposite.getDisplay().syncExec(() -> {
+			if (fTerminalControl != null && !fTerminalControl.isDisposed()) {
+				fTerminalControl.clearTerminal();
+				fTerminalControl.connectTerminal();
+
+				// The actual terminal widget initializes its defaults in the line above,
+				// lets override them with our application defaults right after.
+				setDefaults();
 			}
 		});
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/IGDBDebuggerConsole.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/IGDBDebuggerConsole.java
index 7606ec7f4c6..6a0ca22899a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/IGDBDebuggerConsole.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/IGDBDebuggerConsole.java
@@ -42,15 +42,12 @@ public interface IGDBDebuggerConsole extends IDebuggerConsole {
 			}
 		}
 
-		session.getExecutor().execute(new Runnable() {
-			@Override
-			public void run() {
-				DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), session.getId());
-				IGDBFocusSynchronizer gdbSync = tracker.getService(IGDBFocusSynchronizer.class);
-				tracker.dispose();
-				if (gdbSync != null) {
-					gdbSync.sessionSelected();
-				}
+		session.getExecutor().execute(() -> {
+			DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), session.getId());
+			IGDBFocusSynchronizer gdbSync = tracker.getService(IGDBFocusSynchronizer.class);
+			tracker.dispose();
+			if (gdbSync != null) {
+				gdbSync.sessionSelected();
 			}
 		});
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/ConsoleSaveAction.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/ConsoleSaveAction.java
index 60b5392eea2..82857bcf6c4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/ConsoleSaveAction.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/actions/ConsoleSaveAction.java
@@ -53,12 +53,7 @@ public class ConsoleSaveAction extends Action {
 			return;
 		}
 
-		Runnable saveJob = new Runnable() {
-			@Override
-			public void run() {
-				saveContent(fileName);
-			}
-		};
+		Runnable saveJob = () -> saveContent(fileName);
 		BusyIndicator.showWhile(Display.getCurrent(), saveJob);
 	}
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
index 7227c39c6a6..812e49dedc6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
@@ -241,14 +241,10 @@ public class SessionOSData {
 			//  async/job runnables, like perspective switch runnable using during debug launch,
 			//   causing launch to be stuck at random point.
 			//
-			Display.getDefault().asyncExec(new Runnable() {
+			Display.getDefault().asyncExec(() -> {
 
-				@Override
-				public void run() {
-
-					if (!c.isDisposed())
-						fUIListener.update();
-				}
+				if (!c.isDisposed())
+					fUIListener.update();
 			});
 
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/sync/GdbDebugContextSyncManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/sync/GdbDebugContextSyncManager.java
index 58beed0fc57..9ca8a51ee6d 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/sync/GdbDebugContextSyncManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/sync/GdbDebugContextSyncManager.java
@@ -64,23 +64,19 @@ public class GdbDebugContextSyncManager implements IDebugContextListener {
 				DsfSession session = DsfSession.getSession(eventSessionId);
 
 				// order GDB to switch thread
-				session.getExecutor().execute(new Runnable() {
-					@Override
-					public void run() {
-						DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(),
-								eventSessionId);
-						IGDBFocusSynchronizer gdbSync = tracker.getService(IGDBFocusSynchronizer.class);
-						tracker.dispose();
+				session.getExecutor().execute(() -> {
+					DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), eventSessionId);
+					IGDBFocusSynchronizer gdbSync = tracker.getService(IGDBFocusSynchronizer.class);
+					tracker.dispose();
 
-						if (gdbSync != null) {
-							gdbSync.setFocus(new IDMContext[] { dmc }, new ImmediateRequestMonitor() {
-								@Override
-								protected void handleFailure() {
-									// do not set error - it's normal in some cases to fail to switch thread
-									// for example in a remote session with the inferior running and in all-stop mode
-								}
-							});
-						}
+					if (gdbSync != null) {
+						gdbSync.setFocus(new IDMContext[] { dmc }, new ImmediateRequestMonitor() {
+							@Override
+							protected void handleFailure() {
+								// do not set error - it's normal in some cases to fail to switch thread
+								// for example in a remote session with the inferior running and in all-stop mode
+							}
+						});
 					}
 				});
 			}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
index b6d3b87aeef..3d034d61c69 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
@@ -72,12 +72,9 @@ public class TraceControlModel {
 	private volatile ITraceTargetDMContext fTargetContext;
 	private TraceControlView fTraceControlView;
 
-	private IDebugContextListener fDebugContextListener = new IDebugContextListener() {
-		@Override
-		public void debugContextChanged(DebugContextEvent event) {
-			if ((event.getFlags() & DebugContextEvent.ACTIVATED) != 0) {
-				updateDebugContext();
-			}
+	private IDebugContextListener fDebugContextListener = event -> {
+		if ((event.getFlags() & DebugContextEvent.ACTIVATED) != 0) {
+			updateDebugContext();
 		}
 	};
 
@@ -461,13 +458,10 @@ public class TraceControlModel {
 	private void notifyUI(final ITraceStatusDMData2 data) {
 		final TraceControlView v = fTraceControlView;
 		if (v != null) {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (v != null) {
-						v.fLastRefreshTime = System.currentTimeMillis();
-						v.updateUI(data);
-					}
+			Display.getDefault().asyncExec(() -> {
+				if (v != null) {
+					v.fLastRefreshTime = System.currentTimeMillis();
+					v.updateUI(data);
 				}
 			});
 		}
@@ -476,12 +470,9 @@ public class TraceControlModel {
 	private void notifyUI(final String message) {
 		final TraceControlView v = fTraceControlView;
 		if (v != null) {
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					if (v != null) {
-						v.updateUI(message);
-					}
+			Display.getDefault().asyncExec(() -> {
+				if (v != null) {
+					v.updateUI(message);
 				}
 			});
 		}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
index 066d63777a9..eb3b2750882 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
@@ -119,28 +119,25 @@ public class GdbVariableVMNode extends VariableVMNode {
 			final IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(getDMContext(),
 					IExpressionDMContext.class);
 			if (exprDmc != null) {
-				getSession().getExecutor().execute(new Runnable() {
-					@Override
-					public void run() {
-						final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
-						if (expressionService != null) {
-							final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
-									getSession().getExecutor(), null) {
-								@Override
-								public void handleCompleted() {
-									if (isSuccess()) {
-										request.setSize(getData().getSize());
-									}
-									request.setStatus(getStatus());
-									request.done();
+				getSession().getExecutor().execute(() -> {
+					final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
+					if (expressionService != null) {
+						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
+								getSession().getExecutor(), null) {
+							@Override
+							public void handleCompleted() {
+								if (isSuccess()) {
+									request.setSize(getData().getSize());
 								}
-							};
+								request.setStatus(getStatus());
+								request.done();
+							}
+						};
 
-							expressionService.getExpressionAddressData(exprDmc, drm);
-						} else {
-							request.setStatus(internalError());
-							request.done();
-						}
+						expressionService.getExpressionAddressData(exprDmc, drm);
+					} else {
+						request.setStatus(internalError());
+						request.done();
 					}
 				});
 			} else {
@@ -161,28 +158,25 @@ public class GdbVariableVMNode extends VariableVMNode {
 			final IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(getDMContext(),
 					IExpressionDMContext.class);
 			if (exprDmc != null) {
-				getSession().getExecutor().execute(new Runnable() {
-					@Override
-					public void run() {
-						final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
-						if (expressionService != null) {
-							final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
-									getSession().getExecutor(), null) {
-								@Override
-								public void handleCompleted() {
-									if (isSuccess()) {
-										request.setCanCreate(getData().getSize() > 0);
-									}
-									request.setStatus(getStatus());
-									request.done();
+				getSession().getExecutor().execute(() -> {
+					final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
+					if (expressionService != null) {
+						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
+								getSession().getExecutor(), null) {
+							@Override
+							public void handleCompleted() {
+								if (isSuccess()) {
+									request.setCanCreate(getData().getSize() > 0);
 								}
-							};
+								request.setStatus(getStatus());
+								request.done();
+							}
+						};
 
-							expressionService.getExpressionAddressData(exprDmc, drm);
-						} else {
-							request.setStatus(internalError());
-							request.done();
-						}
+						expressionService.getExpressionAddressData(exprDmc, drm);
+					} else {
+						request.setStatus(internalError());
+						request.done();
 					}
 				});
 			} else {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStackFramesVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStackFramesVMNode.java
index fa3b549f96a..eecdb0224ba 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStackFramesVMNode.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/GdbStackFramesVMNode.java
@@ -53,65 +53,60 @@ public class GdbStackFramesVMNode extends StackFramesVMNode {
 	}
 
 	private void buildDeltaForFocusChangedEvent(IGDBFocusChangedEvent event, VMDelta parentDelta, RequestMonitor rm) {
-		getSession().getExecutor().execute(new Runnable() {
-			@Override
-			public void run() {
-				IDMContext ctx = event.getDMContext();
+		getSession().getExecutor().execute(() -> {
+			IDMContext ctx = event.getDMContext();
 
-				// Is IGDBFocusChangedEvent pertinent for this VMNode?
-				if (ctx instanceof IFrameDMContext) {
-					IFrameDMContext newFrameFocus = (IFrameDMContext) ctx;
-					IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(newFrameFocus,
-							IMIExecutionDMContext.class);
-					if (execDmc == null) {
-						rm.done();
-						return;
-					}
+			// Is IGDBFocusChangedEvent pertinent for this VMNode?
+			if (ctx instanceof IFrameDMContext) {
+				IFrameDMContext newFrameFocus = (IFrameDMContext) ctx;
+				IMIExecutionDMContext execDmc = DMContexts.getAncestorOfType(newFrameFocus,
+						IMIExecutionDMContext.class);
+				if (execDmc == null) {
+					rm.done();
+					return;
+				}
 
-					IRunControl runControl = getServicesTracker().getService(IRunControl.class);
-					if (runControl == null) {
-						// Required services have not initialized yet.  Ignore the event.
-						rm.done();
-						return;
-					}
+				IRunControl runControl = getServicesTracker().getService(IRunControl.class);
+				if (runControl == null) {
+					// Required services have not initialized yet.  Ignore the event.
+					rm.done();
+					return;
+				}
 
-					if (runControl.isSuspended(execDmc) || runControl.isStepping(execDmc)) {
-						// find the VMC index for the frame that switched, so we can select it correctly.
-						getVMCIndexForDmc(GdbStackFramesVMNode.this, newFrameFocus, parentDelta,
-								new DataRequestMonitor<Integer>(getExecutor(), rm) {
-									@Override
-									protected void handleSuccess() {
-										// change to frameOffset
-										final int frameOffset = getData();
+				if (runControl.isSuspended(execDmc) || runControl.isStepping(execDmc)) {
+					// find the VMC index for the frame that switched, so we can select it correctly.
+					getVMCIndexForDmc(GdbStackFramesVMNode.this, newFrameFocus, parentDelta,
+							new DataRequestMonitor<Integer>(getExecutor(), rm) {
+								@Override
+								protected void handleSuccess() {
+									// change to frameOffset
+									final int frameOffset = getData();
 
-										// Retrieve the list of stack frames
-										getVMProvider().updateNode(GdbStackFramesVMNode.this,
-												new VMChildrenUpdate(parentDelta,
-														getVMProvider().getPresentationContext(), -1, -1,
-														new DataRequestMonitor<List<Object>>(getExecutor(), rm) {
-															@Override
-															public void handleSuccess() {
-																final List<Object> data = getData();
-																if (data != null && data.size() != 0) {
-																	// create the delta to select the
-																	// current stack frame
-																	parentDelta.addNode(data.get(frameOffset),
-																			frameOffset,
-																			IModelDelta.SELECT | IModelDelta.FORCE);
-																}
-																rm.done();
+									// Retrieve the list of stack frames
+									getVMProvider().updateNode(GdbStackFramesVMNode.this,
+											new VMChildrenUpdate(parentDelta, getVMProvider().getPresentationContext(),
+													-1, -1, new DataRequestMonitor<List<Object>>(getExecutor(), rm) {
+														@Override
+														public void handleSuccess() {
+															final List<Object> data = getData();
+															if (data != null && data.size() != 0) {
+																// create the delta to select the
+																// current stack frame
+																parentDelta.addNode(data.get(frameOffset), frameOffset,
+																		IModelDelta.SELECT | IModelDelta.FORCE);
 															}
-														}));
-									}
-								});
-					} else {
-						// thread is running - no delta to produce for the stack frame node
-						rm.done();
-					}
+															rm.done();
+														}
+													}));
+								}
+							});
 				} else {
-					// context not a frame  - nothing to do here
+					// thread is running - no delta to produce for the stack frame node
 					rm.done();
 				}
+			} else {
+				// context not a frame  - nothing to do here
+				rm.done();
 			}
 		});
 	}