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>

2 files changed, 29 insertions, 57 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java
index caecfc274..7abcddaec 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * 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
@@ -15,12 +15,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
 import org.eclipse.core.runtime.Assert;
-
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
@@ -82,18 +80,7 @@ public class ImageDescriptorRegistry {
 	}
 
 	private void hookDisplay() {
-		fDisplay.asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				fDisplay.disposeExec(new Runnable() {
-
-					@Override
-					public void run() {
-						dispose();
-					}
-				});
-			}
-		});
+		fDisplay.asyncExec(() -> fDisplay.disposeExec(() -> dispose()));
 	}
 }
 
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
index 5de79ecd5..f6f0dc02a 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
@@ -68,9 +68,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
@@ -166,19 +164,17 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta
                 newConfigList.add(configuration);
             }
 
-			Display.getDefault().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					TableItem[] items= viewer.getTable().getItems();
-					for (int i = 0; i < items.length; i++) {
-						TableItem item = items[i];
-						Object data= item.getData();
-						if (data == oldConfig) {
-							// Found the movedFrom config in the tree. Replace it with the new config
-							item.setData(configuration);
-							viewer.update(configuration, null);
-							break;
-						}
+			Display.getDefault().asyncExec(() -> {
+				TableItem[] items = viewer.getTable().getItems();
+				for (int i = 0; i < items.length; i++) {
+					TableItem item = items[i];
+					Object data = item.getData();
+					if (data == oldConfig) {
+						// Found the movedFrom config in the tree. Replace it
+						// with the new config
+						item.setData(configuration);
+						viewer.update(configuration, null);
+						break;
 					}
 				}
 			});
@@ -337,14 +333,12 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta
 			}
 		});
 
-		builderTable.addListener(SWT.MouseDoubleClick, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				//we must not allow editing of elements that cannot be edited via the selection changed logic
-				//https://bugs.eclipse.org/bugs/show_bug.cgi?id=386820
-				if(fCanEdit) {
-					handleEditButtonPressed();
-				}
+		builderTable.addListener(SWT.MouseDoubleClick, event -> {
+			// we must not allow editing of elements that cannot be edited via
+			// the selection changed logic
+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=386820
+			if (fCanEdit) {
+				handleEditButtonPressed();
 			}
 		});
 
@@ -780,15 +774,10 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta
 		} else {
 			status[0] = new Status(IStatus.ERROR, ExternalToolsPlugin.PLUGIN_ID, 0, ExternalToolsUIMessages.BuilderPropertyPage_statusMessage, e);
 		}
-		Display.getDefault().asyncExec(new Runnable() {
-		    @Override
-			public void run() {
-		        Shell shell= getShell();
-		        if (shell != null) {
-		            ErrorDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_errorTitle,
-		                    ExternalToolsUIMessages.BuilderPropertyPage_errorMessage,
-		                    status[0]);
-		        }
+		Display.getDefault().asyncExec(() -> {
+			Shell shell = getShell();
+			if (shell != null) {
+				ErrorDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, ExternalToolsUIMessages.BuilderPropertyPage_errorMessage, status[0]);
 		    }
 		});
 	}
@@ -945,14 +934,10 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta
 		for (int i = 0; i < numCommands; i++) {
 			itemData[i]= builderTable.getItem(i).getData();
 		}
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-				doPerformOk(monitor, itemData);
-				if (monitor.isCanceled()) {
-					throw new InterruptedException();
-				}
+		IRunnableWithProgress runnable = monitor -> {
+			doPerformOk(monitor, itemData);
+			if (monitor.isCanceled()) {
+				throw new InterruptedException();
 			}
 		};