Convert new Runnable to lambda.

Take 2.

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

2 files changed, 89 insertions, 140 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index a498ba1363b..8186fc07b92 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -266,24 +266,9 @@ public class ManagedBuildManager extends AbstractCExtension {
 
 	private static Map<IProject, IManagedBuildInfo> fInfoMap = new HashMap<>();
 
-	private static ISorter fToolChainSorter = new ISorter() {
-		@Override
-		public void sort() {
-			resortToolChains();
-		}
-	};
-	private static ISorter fToolSorter = new ISorter() {
-		@Override
-		public void sort() {
-			resortTools();
-		}
-	};
-	private static ISorter fBuilderSorter = new ISorter() {
-		@Override
-		public void sort() {
-			resortBuilders();
-		}
-	};
+	private static ISorter fToolChainSorter = () -> resortToolChains();
+	private static ISorter fToolSorter = () -> resortTools();
+	private static ISorter fBuilderSorter = () -> resortBuilders();
 
 	private static interface ISorter {
 		void sort();
@@ -291,14 +276,11 @@ public class ManagedBuildManager extends AbstractCExtension {
 
 	static {
 		getEnvironmentVariableProvider()
-				.subscribe(fEnvironmentBuildPathsChangeListener = new IEnvironmentBuildPathsChangeListener() {
-					@Override
-					public void buildPathsChanged(IConfiguration configuration, int buildPathType) {
-						//						if(buildPathType == IEnvVarBuildPath.BUILDPATH_INCLUDE){
-						//							initializePathEntries(configuration,null);
-						//							notifyListeners(configuration,null);
-						//						}
-					}
+				.subscribe(fEnvironmentBuildPathsChangeListener = (configuration, buildPathType) -> {
+					//						if(buildPathType == IEnvVarBuildPath.BUILDPATH_INCLUDE){
+					//							initializePathEntries(configuration,null);
+					//							notifyListeners(configuration,null);
+					//						}
 				});
 	}
 
@@ -876,7 +858,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 				return;
 			}
 		} catch (BuildException e) {return;}
-
+	
 		// Figure out if there is a listener for this change
 		IResource resource = config.getOwner();
 		List listeners = (List) getBuildModelListeners().get(resource);
@@ -1310,14 +1292,10 @@ public class ManagedBuildManager extends AbstractCExtension {
 			final Shell shell = window.getShell();
 			if (shell != null) {
 				final String exceptionMsg = err.getMessage();
-				shell.getDisplay().syncExec(new Runnable() {
-					@Override
-					public void run() {
-						MessageDialog.openError(shell,
+				shell.getDisplay()
+						.syncExec(() -> MessageDialog.openError(shell,
 								ManagedMakeMessages.getResourceString("ManagedBuildManager.error.write_failed_title"), //$NON-NLS-1$
-								ManagedMakeMessages.getFormattedString(MANIFEST_ERROR_WRITE_FAILED, exceptionMsg));
-					}
-				});
+								ManagedMakeMessages.getFormattedString(MANIFEST_ERROR_WRITE_FAILED, exceptionMsg)));
 			}
 		}
 		// If we return an honest status when the operation fails, there are instances when the UI behavior
@@ -1385,10 +1363,10 @@ public class ManagedBuildManager extends AbstractCExtension {
 		try {
 			DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
 			Document doc = builder.newDocument();
-
+		
 			// Get the build information for the project
 			ManagedBuildInfo buildInfo = (ManagedBuildInfo) getBuildInfo(project);
-
+		
 			// Save the build info
 			if (buildInfo != null &&
 					!buildInfo.isReadOnly() &&
@@ -1403,7 +1381,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 				Element rootElement = doc.createElement(ROOT_NODE_NAME);
 				doc.appendChild(rootElement);
 				buildInfo.serialize(doc, rootElement);
-
+		
 				// Transform the document to something we can save in a file
 				ByteArrayOutputStream stream = new ByteArrayOutputStream();
 				Transformer transformer = TransformerFactory.newInstance().newTransformer();
@@ -1413,11 +1391,11 @@ public class ManagedBuildManager extends AbstractCExtension {
 				DOMSource source = new DOMSource(doc);
 				StreamResult result = new StreamResult(stream);
 				transformer.transform(source, result);
-
+		
 				// Save the document
 				IFile projectFile = project.getFile(SETTINGS_FILE_NAME);
 				String utfString = stream.toString("UTF-8");	//$NON-NLS-1$
-
+		
 				if (projectFile.exists()) {
 					if (projectFile.isReadOnly()) {
 						// If we are not running headless, and there is a UI Window around, grab it
@@ -1451,7 +1429,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 				} else {
 					projectFile.create(new ByteArrayInputStream(utfString.getBytes("UTF-8")), IResource.FORCE, new NullProgressMonitor());	//$NON-NLS-1$
 				}
-
+		
 				// Close the streams
 				stream.close();
 			}
@@ -1472,7 +1450,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 			// Save to IFile failed
 		    err = e;
 		}
-
+		
 		if (err != null) {
 			// Put out an error message indicating that the attempted write to the .cdtbuild project file failed
 			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
@@ -1480,7 +1458,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 				IWorkbenchWindow windows[] = PlatformUI.getWorkbench().getWorkbenchWindows();
 				window = windows[0];
 			}
-
+		
 			final Shell shell = window.getShell();
 			if (shell != null) {
 				final String exceptionMsg = err.getMessage();
@@ -1558,9 +1536,9 @@ public class ManagedBuildManager extends AbstractCExtension {
 			for (int i=0; i < configs.length; i++) {
 				ManagedBuildManager.performValueHandlerEvent(configs[i], IManagedOptionValueHandler.EVENT_CLOSE);
 			}
-
+		
 			info.setValid(false);
-
+		
 			try {
 				resource.setSessionProperty(buildInfoProperty, null);
 			} catch (CoreException e) {
@@ -1841,7 +1819,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 		return Status.OK_STATUS;
 		/*
 		ManagedBuildInfo buildInfo = null;
-
+		
 		// Get the build info associated with this project for this session
 		try {
 			buildInfo = findBuildInfo(resource.getProject(), true);
@@ -2127,15 +2105,11 @@ public class ManagedBuildManager extends AbstractCExtension {
 							final Shell shell = window.getShell();
 							final String errMsg = ManagedMakeMessages.getFormattedString(MANIFEST_VERSION_ERROR,
 									extension.getUniqueIdentifier());
-							shell.getDisplay().asyncExec(new Runnable() {
-								@Override
-								public void run() {
-									MessageDialog.openError(shell,
+							shell.getDisplay()
+									.asyncExec(() -> MessageDialog.openError(shell,
 											ManagedMakeMessages.getResourceString(
 													"ManagedBuildManager.error.manifest_load_failed_title"), //$NON-NLS-1$
-											errMsg);
-								}
-							});
+											errMsg));
 						} else {
 							// Get the "configuraton elements" defined in the plugin.xml file.
 							// Note that these "configuration elements" are not related to the
@@ -2755,7 +2729,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 					} catch (Exception e) {
 						// TODO:  Issue error reagarding not being able to load the project file (.cdtbuild)
 					}
-
+		
 					try {
 						// Check if the project needs its container initialized
 						initBuildInfoContainer(buildInfo);
@@ -2837,7 +2811,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 	 */
 	/*	synchronized private static ManagedBuildInfo findBuildInfoSynchronized(IProject project, boolean forceLoad) {
 			ManagedBuildInfo buildInfo = null;
-
+	
 			// Check if there is any build info associated with this project for this session
 			try {
 				buildInfo = (ManagedBuildInfo)project.getSessionProperty(buildInfoProperty);
@@ -2848,7 +2822,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 			} catch (CoreException e) {
 		//		return null;
 			}
-
+	
 			if(buildInfo == null && forceLoad){
 				// Make sure the extension information is loaded first
 				try {
@@ -2857,11 +2831,11 @@ public class ManagedBuildManager extends AbstractCExtension {
 					e.printStackTrace();
 					return null;
 				}
-
-
+	
+	
 				// Check weather getBuildInfo is called from converter
 				buildInfo = UpdateManagedProjectManager.getConvertedManagedBuildInfo(project);
-
+	
 				// Nothing in session store, so see if we can load it from cdtbuild
 				if (buildInfo == null) {
 					try {
@@ -2878,7 +2852,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 							IWorkbenchWindow windows[] = PlatformUI.getWorkbench().getWorkbenchWindows();
 							window = windows[0];
 						}
-
+	
 						final Shell shell = window.getShell();
 						final String exceptionMsg = e.getMessage();
 						//using syncExec could cause a dead-lock
@@ -2892,7 +2866,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 							}
 						} );
 					}
-
+	
 					if (buildInfo != null && !buildInfo.isContainerInited()) {
 						//  NOTE:  If this is called inside the above rule, then an IllegalArgumentException can
 						//         occur when the CDT project file is saved - it uses the Workspace Root as the scheduling rule.
@@ -2906,7 +2880,7 @@ public class ManagedBuildManager extends AbstractCExtension {
 					}
 				}
 			}
-
+	
 			return buildInfo;
 		}
 	*/
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
index f50e278209f..fe10fe07dd6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.ICDescriptor;
-import org.eclipse.cdt.core.ICDescriptorOperation;
 import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IPathEntry;
@@ -58,7 +56,6 @@ import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -269,17 +266,14 @@ public class ProjectConverter implements ICProjectConverter {
 
 		final Shell shell = window.getShell();
 		final boolean[] answer = new boolean[1];
-		shell.getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				Object ob = PROPS.getProperty(rc, id);
-				if (multiple || ob == null) {
-					PROPS.setProperty(rc, id, Boolean.TRUE);
-					answer[0] = MessageDialog.openQuestion(shell, title, message);
-					PROPS.setProperty(rc, id, answer[0] ? Boolean.TRUE : Boolean.FALSE);
-				} else {
-					answer[0] = ((Boolean) ob).booleanValue();
-				}
+		shell.getDisplay().syncExec(() -> {
+			Object ob = PROPS.getProperty(rc, id);
+			if (multiple || ob == null) {
+				PROPS.setProperty(rc, id, Boolean.TRUE);
+				answer[0] = MessageDialog.openQuestion(shell, title, message);
+				PROPS.setProperty(rc, id, answer[0] ? Boolean.TRUE : Boolean.FALSE);
+			} else {
+				answer[0] = ((Boolean) ob).booleanValue();
 			}
 		});
 		return answer[0];
@@ -294,13 +288,10 @@ public class ProjectConverter implements ICProjectConverter {
 		}
 
 		final Shell shell = window.getShell();
-		shell.getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				if (multiple || PROPS.getProperty(rc, id) == null) {
-					PROPS.setProperty(rc, id, Boolean.TRUE);
-					MessageDialog.openInformation(shell, title, message);
-				}
+		shell.getDisplay().syncExec(() -> {
+			if (multiple || PROPS.getProperty(rc, id) == null) {
+				PROPS.setProperty(rc, id, Boolean.TRUE);
+				MessageDialog.openInformation(shell, title, message);
 			}
 		});
 	}
@@ -311,42 +302,31 @@ public class ProjectConverter implements ICProjectConverter {
 			monitor = new NullProgressMonitor();
 
 		CCorePlugin.getDefault().getCDescriptorManager().runDescriptorOperation(project, des,
-				new ICDescriptorOperation() {
-
-					@Override
-					public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException {
-						final IMakeTargetManager mngr = MakeCorePlugin.getDefault().getTargetManager();
-
-						project.accept(new IResourceVisitor() {
-
-							@Override
-							public boolean visit(IResource resource) throws CoreException {
-								if (resource.getType() == IResource.FILE)
-									return false;
-
-								try {
-									IContainer cr = (IContainer) resource;
-									IMakeTarget targets[] = mngr.getTargets(cr);
-									for (int i = 0; i < targets.length; i++) {
-										IMakeTarget t = targets[i];
-										if (!OLD_MAKE_TARGET_BUIDER_ID.equals(t.getTargetBuilderID()))
-											continue;
-
-										IMakeTarget newT = mngr.createTarget(project, t.getName(),
-												NEW_MAKE_TARGET_BUIDER_ID);
-										copySettings(t, newT);
-										mngr.removeTarget(t);
-										mngr.addTarget(cr, newT);
-									}
-								} catch (CoreException e) {
-									ManagedBuilderCorePlugin.log(e);
-								}
-								return true;
+				(descriptor, monitor1) -> {
+					final IMakeTargetManager mngr = MakeCorePlugin.getDefault().getTargetManager();
+
+					project.accept(resource -> {
+						if (resource.getType() == IResource.FILE)
+							return false;
+
+						try {
+							IContainer cr = (IContainer) resource;
+							IMakeTarget targets[] = mngr.getTargets(cr);
+							for (int i = 0; i < targets.length; i++) {
+								IMakeTarget t = targets[i];
+								if (!OLD_MAKE_TARGET_BUIDER_ID.equals(t.getTargetBuilderID()))
+									continue;
+
+								IMakeTarget newT = mngr.createTarget(project, t.getName(), NEW_MAKE_TARGET_BUIDER_ID);
+								copySettings(t, newT);
+								mngr.removeTarget(t);
+								mngr.addTarget(cr, newT);
 							}
-
-						});
-					}
-
+						} catch (CoreException e) {
+							ManagedBuilderCorePlugin.log(e);
+						}
+						return true;
+					});
 				}, monitor);
 	}
 
@@ -541,32 +521,27 @@ public class ProjectConverter implements ICProjectConverter {
 				}
 
 				final IWorkspace wsp = ResourcesPlugin.getWorkspace();
-				wsp.run(new IWorkspaceRunnable() {
-
-					@Override
-					public void run(IProgressMonitor monitor) throws CoreException {
-						project.setDescription(eDes, monitor);
-						CCorePlugin.getDefault().setProjectDescription(project, newDes);
-						Job job = new Job(DataProviderMessages.getString("ProjectConverter.7")) { //$NON-NLS-1$
-
-							@Override
-							protected IStatus run(IProgressMonitor monitor) {
-								try {
-									ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(project);
-									convertMakeTargetInfo(project, des, monitor);
-									CCorePlugin.getDefault().setProjectDescription(project, des);
-								} catch (CoreException e) {
-									return e.getStatus();
-								}
-								return Status.OK_STATUS;
+				wsp.run((IWorkspaceRunnable) monitor1 -> {
+					project.setDescription(eDes, monitor1);
+					CCorePlugin.getDefault().setProjectDescription(project, newDes);
+					Job job = new Job(DataProviderMessages.getString("ProjectConverter.7")) { //$NON-NLS-1$
+
+						@Override
+						protected IStatus run(IProgressMonitor monitor) {
+							try {
+								ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(project);
+								convertMakeTargetInfo(project, des, monitor);
+								CCorePlugin.getDefault().setProjectDescription(project, des);
+							} catch (CoreException e) {
+								return e.getStatus();
 							}
+							return Status.OK_STATUS;
+						}
 
-						};
-
-						job.setRule(wsp.getRoot());
-						job.schedule();
-					}
+					};
 
+					job.setRule(wsp.getRoot());
+					job.schedule();
 				}, wsp.getRoot(), IWorkspace.AVOID_UPDATE, monitor);
 			}
 			return true;