autotools: Bump o.e.cdt.autotools.ui BREE to 1.8.

* Use lambdas.
* Remove non-javadoc comments.

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

build/org.eclipse.cdt.autotools.ui/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

build/org.eclipse.cdt.autotools.ui/.settings/org.eclipse.jdt.core.prefs

@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -98,4 +98,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

build/org.eclipse.cdt.autotools.ui/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.make.ui;bundle-version="6.0.0",
  org.eclipse.ui.views;bundle-version="3.4.0",
  org.eclipse.cdt.remote.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.autotools.ui,
  org.eclipse.cdt.autotools.ui.editors,

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/AutotoolsUIPlugin.java

@@ -180,12 +180,7 @@ public class AutotoolsUIPlugin extends AbstractUIPlugin {
 		if (display == null)
 			display = Display.getDefault();
 		final IStatus fstatus = status;
-		display.asyncExec(new Runnable() {
+		display.asyncExec(() -> ErrorDialog.openError(null, title, null, fstatus));
-			@Override
-			public void run() {
-				ErrorDialog.openError(null, title, null, fstatus);
-			}
-		});
 	}
 
 	public static void logException(Throwable e) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java

@@ -68,19 +68,11 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
 			final Control control = viewer.getControl();
 			if (control != null && !control.isDisposed())
 			{
-				control.getDisplay().asyncExec(new Runnable() {
+				control.getDisplay().asyncExec(() -> {
-					@Override
+					if (!control.isDisposed()) {
-					public void run() {
+						ISelection sel = viewer.getSelection();
-						if (!control.isDisposed()) {
+						viewer.setSelection(updateSelection(sel));
-//							control.setRedraw(false);
+						viewer.refresh();
-//							if (input != null)
-//								viewer.setInput(input);
-//							viewer.expandAll();
-//							control.setRedraw(true);
-							ISelection sel= viewer.getSelection();
-							viewer.setSelection(updateSelection(sel));		
-							viewer.refresh();
-						}
 					}
 				});
 			}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/ResourceLookup.java

@@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.autotools.ui;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -123,19 +122,16 @@ public class ResourceLookup {
 	 * <br> Files on a source root of a CDT project
 	 */
 	public static void sortFilesByRelevance(IFile[] filesToSort, final IProject preferredProject) {
-		Collections.sort(Arrays.asList(filesToSort), new Comparator<IFile>() {
+		Collections.sort(Arrays.asList(filesToSort), (IFile f1, IFile f2) -> {
-			@Override
+			int r1 = FileRelevance.getRelevance(f1, preferredProject);
-			public int compare(IFile f1, IFile f2) {
+			int r2 = FileRelevance.getRelevance(f2, preferredProject);
-				int r1= FileRelevance.getRelevance(f1, preferredProject);
-				int r2= FileRelevance.getRelevance(f2, preferredProject);
 
-				if (r1 > r2)
+			if (r1 > r2)
-					return -1;
+				return -1;
-				if (r1 < r2)
+			if (r1 < r2)
-					return 1;
+				return 1;
 
-				return f1.getFullPath().toString().compareTo(f2.getFullPath().toString());
+			return f1.getFullPath().toString().compareTo(f2.getFullPath().toString());
-			}
 		});
 	}
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/InvokeAction.java

@@ -324,116 +324,126 @@ public abstract class InvokeAction extends AbstractTargetAction {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+					ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) monitor1 -> {
+						try {
+							String errMsg = null;
+							IProject project = getSelectedContainer().getProject();
+							// Get a build console for the project
+							IConsole console = CCorePlugin.getDefault()
+									.getConsole("org.eclipse.cdt.autotools.ui.autotoolsConsole"); //$NON-NLS-1$
+							console.start(project);
+							CUIPlugin.getDefault().startGlobalConsole();
+							ConsoleOutputStream consoleOutStream = console.getOutputStream();
+							// FIXME: we want to remove need for
+							// ManagedBuilderManager, but how do we
+							// get environment variables.
+							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+							IConfiguration cfg = info.getDefaultConfiguration();
 
-						@Override
+							StringBuffer buf = new StringBuffer();
-						public void run(IProgressMonitor monitor) throws CoreException {
+							String[] consoleHeader = new String[3];
-							try {
-								String errMsg = null;
-								IProject project = getSelectedContainer().getProject();
-								// Get a build console for the project
-								IConsole console = CCorePlugin.getDefault().getConsole("org.eclipse.cdt.autotools.ui.autotoolsConsole"); //$NON-NLS-1$
-								console.start(project);
-								CUIPlugin.getDefault().startGlobalConsole();
-								ConsoleOutputStream consoleOutStream = console.getOutputStream();
-								// FIXME: we want to remove need for ManagedBuilderManager, but how do we
-								// get environment variables.
-								IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-								IConfiguration cfg = info.getDefaultConfiguration();
 
-								StringBuffer buf = new StringBuffer();
+							consoleHeader[0] = actionName;
-								String[] consoleHeader = new String[3];
+							consoleHeader[1] = cfg.getName();
+							consoleHeader[2] = project.getName();
+							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
+							String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+									new String[] { actionName, execDir.toString() }); // $NON-NLS-1$
+							buf.append(invokeMsg);
+							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
+							buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
+							consoleOutStream.write(buf.toString().getBytes());
+							consoleOutStream.flush();
 
-								consoleHeader[0] = actionName;
+							ArrayList<String> additionalEnvs = new ArrayList<>();
-								consoleHeader[1] = cfg.getName();
+							String strippedCommand = AutotoolsNewMakeGenerator.stripEnvVars(command, additionalEnvs);
-								consoleHeader[2] = project.getName();
+							// Get a launcher for the config command
-								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+							RemoteCommandLauncher launcher = new RemoteCommandLauncher();
-								String invokeMsg = InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
+							launcher.setProject(project);
-										new String[]{actionName, execDir.toString()}); //$NON-NLS-1$
+							// Set the environment
-								buf.append(invokeMsg);
+							IEnvironmentVariable variables[] = ManagedBuildManager.getEnvironmentVariableProvider()
-								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+									.getVariables(cfg, true);
-								buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$	//$NON-NLS-2$
+							String[] env = null;
-								consoleOutStream.write(buf.toString().getBytes());
+							ArrayList<String> envList = new ArrayList<>();
-								consoleOutStream.flush();
+							if (variables != null) {
+								for (int i = 0; i < variables.length; i++) {
+									envList.add(variables[i].getName() + "=" + variables[i].getValue()); //$NON-NLS-1$
+								}
+								if (additionalEnvs.size() > 0)
+									envList.addAll(additionalEnvs); // add any
+																	// additional
+																	// environment
+																	// variables
+																	// specified
+																	// ahead of
+																	// script
+								env = envList.toArray(new String[envList.size()]);
+							}
 
-								ArrayList<String> additionalEnvs = new ArrayList<>();
+							String[] newArgumentList;
-								String strippedCommand = AutotoolsNewMakeGenerator.stripEnvVars(command, additionalEnvs);
+
-								// Get a launcher for the config command
+							// Fix for bug #343905 and bug #371277
-								RemoteCommandLauncher launcher = new RemoteCommandLauncher();
+							// For Windows and Mac, we cannot run a script
-								launcher.setProject(project);
+							// directly (in this case,
-								// Set the environment
+							// autotools are scripts). We need to run "sh -c
-								IEnvironmentVariable variables[] = ManagedBuildManager
+							// command args where command
-										.getEnvironmentVariableProvider().getVariables(cfg, true);
+							// plus args is represented in a single string. The
-								String[] env = null;
+							// same applies for
-								ArrayList<String> envList = new ArrayList<>();
+							// some Linux shells such as dash. Using sh -c will
-								if (variables != null) {
+							// work on all Linux
-									for (int i = 0; i < variables.length; i++) {
+							// POSIX-compliant shells.
-										envList.add(variables[i].getName()
+							StringBuffer command1 = new StringBuffer(strippedCommand);
-												+ "=" + variables[i].getValue()); //$NON-NLS-1$
+							for (String arg : argumentList) {
-									}
+								command1.append(" " + arg);
-									if (additionalEnvs.size() > 0)
+							}
-										envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script
+							newArgumentList = new String[] { "-c", command1.toString() };
-									env = envList.toArray(new String[envList.size()]);
+   
+							OutputStream stdout = consoleOutStream;
+							OutputStream stderr = consoleOutStream;
+
+							launcher.showCommand(true);
+							// Run the shell script via shell command.
+							Process proc = launcher.execute(new Path(SHELL_COMMAND), newArgumentList, env, execDir,
+									new NullProgressMonitor());
+							if (proc != null) {
+								try {
+									// Close the input of the process since we
+									// will never write to
+									// it
+									proc.getOutputStream().close();
+								} catch (IOException e1) {
 								}
 
-								String[] newArgumentList;
+								if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(monitor1,
-								
+										IProgressMonitor.UNKNOWN)) != ICommandLauncher.OK) {
-								// Fix for bug #343905 and bug #371277
-                                // For Windows and Mac, we cannot run a script directly (in this case,
-                                // autotools are scripts).  We need to run "sh -c command args where command
-								// plus args is represented in a single string.  The same applies for
-								// some Linux shells such as dash.  Using sh -c will work on all Linux
-								// POSIX-compliant shells.
-								StringBuffer command = new StringBuffer(strippedCommand);
-								for (String arg : argumentList) {
-									command.append(" " + arg);
-								}
-								newArgumentList = new String[] { "-c", command.toString() };
-   
-						        OutputStream stdout = consoleOutStream;
-								OutputStream stderr = consoleOutStream;
-
-								launcher.showCommand(true);
-								// Run the shell script via shell command.
-								Process proc = launcher.execute(new Path(SHELL_COMMAND), newArgumentList, env,
-										execDir, new NullProgressMonitor());
-								if (proc != null) {
-									try {
-										// Close the input of the process since we will never write to
-										// it
-										proc.getOutputStream().close();
-									} catch (IOException e) {
-									}
-
-									if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(
-											monitor, IProgressMonitor.UNKNOWN)) != ICommandLauncher.OK) {
-										errMsg = launcher.getErrorMessage();
-									}
-
-									// Force a resync of the projects without allowing the user to
-									// cancel.
-									// This is probably unkind, but short of this there is no way to
-									// ensure
-									// the UI is up-to-date with the build results
-									// monitor.subTask(ManagedMakeMessages
-									// .getResourceString(REFRESH));
-									monitor.subTask(AutotoolsUIPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
-									try {
-										project.refreshLocal(IResource.DEPTH_INFINITE, null);
-									} catch (CoreException e) {
-										monitor.subTask(AutotoolsUIPlugin
-												.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
-									}
-								} else {
 									errMsg = launcher.getErrorMessage();
 								}
 
-								if (errMsg != null)
+								// Force a resync of the projects without
-									AutotoolsUIPlugin.logErrorMessage(errMsg);
+								// allowing the user to
-								
+								// cancel.
-							} catch (IOException e) {
+								// This is probably unkind, but short of this
-								AutotoolsUIPlugin.log(e);
+								// there is no way to
+								// ensure
+								// the UI is up-to-date with the build results
+								// monitor.subTask(ManagedMakeMessages
+								// .getResourceString(REFRESH));
+								monitor1.subTask(AutotoolsUIPlugin.getResourceString("MakeGenerator.refresh")); //$NON-NLS-1$
+								try {
+									project.refreshLocal(IResource.DEPTH_INFINITE, null);
+								} catch (CoreException e2) {
+									monitor1.subTask(
+											AutotoolsUIPlugin.getResourceString("MakeGenerator.refresh.error")); //$NON-NLS-1$
+								}
+							} else {
+								errMsg = launcher.getErrorMessage();
 							}
+
+							if (errMsg != null)
+								AutotoolsUIPlugin.logErrorMessage(errMsg);
+
+						} catch (IOException e3) {
+							AutotoolsUIPlugin.log(e3);
 						}
 					}, rule, IWorkspace.AVOID_UPDATE, monitor);
 				} catch (CoreException e) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/ReconfigureAction.java

@@ -44,20 +44,16 @@ public class ReconfigureAction extends InvokeAction {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+					ResourcesPlugin.getWorkspace().run((IWorkspaceRunnable) monitor1 -> {
-
+						IProject project = getSelectedContainer().getProject();
-						@Override
+						AutotoolsNewMakeGenerator m = new AutotoolsNewMakeGenerator();
-						public void run(IProgressMonitor monitor) {
+						IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-							IProject project = getSelectedContainer().getProject();
+						CUIPlugin.getDefault().startGlobalConsole();
-							AutotoolsNewMakeGenerator m = new AutotoolsNewMakeGenerator();
+						m.initialize(project, info, monitor1);
-							IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
+						try {
-							CUIPlugin.getDefault().startGlobalConsole();
+							m.reconfigure();
-							m.initialize(project, info, monitor);
+						} catch (CoreException e) {
-							try {
+							// do nothing for now
-								m.reconfigure();
-							} catch (CoreException e) {
-								// do nothing for now
-							}
 						}
 					}, rule, IWorkspace.AVOID_UPDATE, monitor);
 				} catch (CoreException e) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/TwoInputDialog.java

@@ -15,8 +15,6 @@ import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -76,12 +74,7 @@ public class TwoInputDialog extends InputDialog {
 		secondText = new Text(composite, SWT.SINGLE | SWT.BORDER);
 		secondText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
 				| GridData.HORIZONTAL_ALIGN_FILL));
-		secondText.addModifyListener(new ModifyListener() {
+		secondText.addModifyListener(e -> validateInput());
-			@Override
-			public void modifyText(ModifyEvent e) {
-				validateInput();
-			}
-		});
 
 		// remove error message dialog from focusing.
 		composite.getTabList()[2].setVisible(false);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AbstractElementListSelectionDialog.java

@@ -193,12 +193,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus
 	 */
 	@Override
 	public int open() {
-		BusyIndicator.showWhile(null, new Runnable() {
+		BusyIndicator.showWhile(null, () -> access$superOpen());
-			@Override
-			public void run() {
-				access$superOpen();
-			}
-		});
 		return getReturnCode() ;
 	}
 	/**

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileCodeScanner.java

@@ -22,7 +22,6 @@ import org.eclipse.jface.text.rules.EndOfLineRule;
 import org.eclipse.jface.text.rules.IPredicateRule;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
 import org.eclipse.jface.text.rules.MultiLineRule;
 import org.eclipse.jface.text.rules.SingleLineRule;
 import org.eclipse.jface.text.rules.Token;
@@ -82,12 +81,7 @@ public class AutomakefileCodeScanner extends AbstractMakefileCodeScanner {
 		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
 
 		// Add generic whitespace rule.
-		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+		rules.add(new WhitespaceRule(character -> Character.isWhitespace(character)));
-			@Override
-			public boolean isWhitespace(char character) {
-				return Character.isWhitespace(character);
-			}
-		}));
 		
 		// Put before the the word rules
 		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/AutomakefileContentOutlinePage.java

@@ -216,15 +216,12 @@ public class AutomakefileContentOutlinePage extends ContentOutlinePage {
 		if (viewer != null) {
 			final Control control = viewer.getControl();
 			if (control != null && !control.isDisposed()) {
-				control.getDisplay().asyncExec(new Runnable() {
+				control.getDisplay().asyncExec(() -> {
-					@Override
+					if (!control.isDisposed()) {
-					public void run() {
+						control.setRedraw(false);
-						if (!control.isDisposed()) {
+						viewer.setInput(fInput);
-							control.setRedraw(false);
+						viewer.expandAll();
-							viewer.setInput(fInput);
+						control.setRedraw(true);
-							viewer.expandAll();
-							control.setRedraw(true);
-						}
 					}
 				});
 			}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileCodeScanner.java

@@ -17,7 +17,6 @@ import org.eclipse.cdt.internal.autotools.ui.preferences.ColorManager;
 import org.eclipse.jface.text.rules.EndOfLineRule;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
 import org.eclipse.jface.text.rules.MultiLineRule;
 import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.jface.text.rules.WordRule;
@@ -71,12 +70,7 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
 		rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
 
 		// Add generic whitespace rule.
-		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+		rules.add(new WhitespaceRule(character -> Character.isWhitespace(character)));
-			@Override
-			public boolean isWhitespace(char character) {
-				return Character.isWhitespace(character);
-			}
-		}));
 
 		// Put before the the word rules
 		MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MakefileContentOutlinePage.java

@@ -16,13 +16,10 @@ import java.util.List;
 
 import org.eclipse.cdt.autotools.ui.AutotoolsUIPlugin;
 import org.eclipse.cdt.internal.autotools.ui.MakeUIImages;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -209,22 +206,14 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 
 		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
 		manager.setRemoveAllWhenShown(true);
-		manager.addMenuListener(new IMenuListener() {
+		manager.addMenuListener(m -> contextMenuAboutToShow(m));
-			@Override
-			public void menuAboutToShow(IMenuManager m) {
-				contextMenuAboutToShow(m);
-			}
-		});
 		Control tree = viewer.getControl();
 		Menu menu = manager.createContextMenu(tree);
 		tree.setMenu(menu);
 
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
+		viewer.addDoubleClickListener(event -> {
-			@Override
+			if (fOpenIncludeAction != null) {
-			public void doubleClick(DoubleClickEvent event) {
+				fOpenIncludeAction.run();
-				if (fOpenIncludeAction != null) {
-					fOpenIncludeAction.run();
-				}
 			}
 		});
 
@@ -267,24 +256,18 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		if (viewer != null) {
 			final Control control = viewer.getControl();
 			if (control != null && !control.isDisposed()) {
-				control.getDisplay().asyncExec(new Runnable() {
+				control.getDisplay().asyncExec(() -> {
-					@Override
+					if (!control.isDisposed()) {
-					public void run() {
+						control.setRedraw(false);
-						if (!control.isDisposed()) {
+						viewer.setInput(fInput);
-							control.setRedraw(false);
+						viewer.expandAll();
-							viewer.setInput(fInput);
+						control.setRedraw(true);
-							viewer.expandAll();
-							control.setRedraw(true);
-						}
 					}
 				});
 			}
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
-	 */
 	@Override
 	public void setActionBars(IActionBars actionBars) {
 		super.setActionBars(actionBars);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/MessageLine.java

@@ -13,8 +13,6 @@ package org.eclipse.cdt.internal.autotools.ui.editors.automake;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.layout.GridData;
@@ -108,12 +106,7 @@ public class MessageLine {
 		} else {
 			if (fErrorColor == null) {
 				fErrorColor= new Color(clabel.getDisplay(), fErrorRGB);
-				clabel.addDisposeListener(new DisposeListener() {
+				clabel.addDisposeListener(e -> fErrorColor.dispose());
-					@Override
-					public void widgetDisposed(DisposeEvent e) {
-						fErrorColor.dispose();
-					}
-				});
 			}
 			clabel.setForeground(fErrorColor);
 			clabel.setText(message);

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/OpenIncludeAction.java

@@ -35,8 +35,6 @@ import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -228,24 +226,19 @@ public class OpenIncludeAction extends Action {
 	 * @throws CoreException
 	 */
 	private void findFile(IContainer parent, final IPath name, final ArrayList<Object> list) throws CoreException {
-		parent.accept(new IResourceProxyVisitor() {
+		parent.accept(proxy -> {
-
+			if (proxy.getType() == IResource.FILE && proxy.getName().equalsIgnoreCase(name.lastSegment())) {
-			@Override
+				IPath rPath = proxy.requestResource().getLocation();
-			public boolean visit(IResourceProxy proxy) {
+				int numSegToRemove = rPath.segmentCount() - name.segmentCount();
-				if (proxy.getType() == IResource.FILE && proxy.getName().equalsIgnoreCase(name.lastSegment())) {
+				IPath sPath = rPath.removeFirstSegments(numSegToRemove);
-					IPath rPath = proxy.requestResource().getLocation();
+				sPath = sPath.setDevice(name.getDevice());
-					int numSegToRemove = rPath.segmentCount() - name.segmentCount();
+				if (Platform.getOS().equals(Platform.OS_WIN32) ? sPath.toOSString().equalsIgnoreCase(name.toOSString())
-					IPath sPath = rPath.removeFirstSegments(numSegToRemove);
+						: sPath.equals(name)) {
-					sPath = sPath.setDevice(name.getDevice());
+					list.add(rPath);
-					if (Platform.getOS().equals(Platform.OS_WIN32) ?
-							sPath.toOSString().equalsIgnoreCase(name.toOSString()) :
-							sPath.equals(name)) {
-						list.add(rPath);
-					}
-					return false;
 				}
-				return true;
+				return false;
 			}
+			return true;
 		}, 0);
 	}
 

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/ResourceMarkerAnnotationModel.java

@@ -23,7 +23,6 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.Position;
 import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
 import org.eclipse.ui.texteditor.MarkerAnnotation;
@@ -42,9 +41,6 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel
 	 * Internal resource change listener.
 	 */
 	class ResourceChangeListener implements IResourceChangeListener {
-		/*
-		 * @see IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
 		@Override
 		public void resourceChanged(IResourceChangeEvent e) {
 			IResourceDelta delta= e.getDelta();
@@ -76,9 +72,6 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel
 		fWorkspace= resource.getWorkspace();
 	}
 
-	/*
-	 * @see AbstractMarkerAnnotationModel#isAcceptable(IMarker)
-	 */
 	@Override
 	protected boolean isAcceptable(IMarker marker) {
 		return marker != null && fResource.equals(marker.getResource());
@@ -179,12 +172,9 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel
 
 	@Override
 	protected void deleteMarkers(final IMarker[] markers) throws CoreException {
-		fWorkspace.run(new IWorkspaceRunnable() {
+		fWorkspace.run((IWorkspaceRunnable) monitor -> {
-			@Override
+			for (int i= 0; i < markers.length; ++i) {
-			public void run(IProgressMonitor monitor) throws CoreException {
+				markers[i].delete();
-				for (int i= 0; i < markers.length; ++i) {
-					markers[i].delete();
-				}
 			}
 		}, null, IWorkspace.AVOID_UPDATE, null);
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/editors/automake/SelectionList.java

@@ -16,8 +16,6 @@ import java.util.List;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -60,12 +58,7 @@ public class SelectionList extends Composite {
 	private void createList(int style) {
 		fList= new Table(this, style);
 		fList.setLayoutData(new GridData(GridData.FILL_BOTH));
-		fList.addDisposeListener(new DisposeListener() {
+		fList.addDisposeListener(e -> fRenderer.dispose());
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				fRenderer.dispose();
-			}
-		});
 	}
 	private void createText() {
 		fText= new Text(this, SWT.BORDER);
@@ -75,12 +68,7 @@ public class SelectionList extends Composite {
 		spec.horizontalAlignment= GridData.FILL;
 		spec.verticalAlignment= GridData.BEGINNING;
 		fText.setLayoutData(spec);
-		Listener l= new Listener() {
+		Listener l = evt -> filter(false);
-			@Override
-			public void handleEvent(Event evt) {
-				filter(false);
-			}
-		};
 		fText.addListener(SWT.Modify, l);
 	}
 	/**

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/preferences/AbstractEditorPreferencePage.java

@@ -29,7 +29,6 @@ import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -64,21 +63,13 @@ public abstract class AbstractEditorPreferencePage extends PreferencePage implem
 	};
 	
 	Map<Text, String> fTextFields= new HashMap<>();
-	private ModifyListener fTextFieldListener= new ModifyListener() {
+	private ModifyListener fTextFieldListener = e -> {
-		@Override
+		Text text = (Text) e.widget;
-		public void modifyText(ModifyEvent e) {
+		fOverlayStore.setValue(fTextFields.get(text), text.getText());
-			Text text= (Text) e.widget;
-			fOverlayStore.setValue(fTextFields.get(text), text.getText());
-		}
 	};
 
 	private Map<Text, Object> fNumberFields= new HashMap<>();
-	private ModifyListener fNumberFieldListener= new ModifyListener() {
+	private ModifyListener fNumberFieldListener = e -> numberFieldChanged((Text) e.widget);
-		@Override
-		public void modifyText(ModifyEvent e) {
-			numberFieldChanged((Text) e.widget);
-		}
-	};
 			
 	public AbstractEditorPreferencePage() {
 		super();
@@ -88,9 +79,6 @@ public abstract class AbstractEditorPreferencePage extends PreferencePage implem
 	
 	protected abstract OverlayPreferenceStore createOverlayStore();
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
 	@Override
 	public void init(IWorkbench workbench) {
 	}
@@ -113,9 +101,6 @@ public abstract class AbstractEditorPreferencePage extends PreferencePage implem
 		}		
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
 	@Override
 	public boolean performOk() {
 		getOverlayStore().propagate();
@@ -149,9 +134,6 @@ public abstract class AbstractEditorPreferencePage extends PreferencePage implem
 		return fNumberFields;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
 	@Override
 	protected void performDefaults() {
 		getOverlayStore().loadDefaults();
@@ -162,9 +144,6 @@ public abstract class AbstractEditorPreferencePage extends PreferencePage implem
 	
 	protected abstract void handleDefaults();
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (getOverlayStore() != null) {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/preferences/AutoconfEditorPreferencePage.java

@@ -21,11 +21,9 @@ import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -153,25 +151,16 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 	 */
 	private static class ColorListLabelProvider extends LabelProvider implements IColorProvider {
 
-		/*
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
 		@Override
 		public String getText(Object element) {
 			return ((HighlightingColorListItem)element).getDisplayName();
 		}
 		
-		/*
-		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-		 */
 		@Override
 		public Color getForeground(Object element) {
 			return ((HighlightingColorListItem)element).getItemColor();
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-		 */
 		@Override
 		public Color getBackground(Object element) {
 			return null;
@@ -185,25 +174,16 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 	 */
 	private static class ColorListContentProvider implements IStructuredContentProvider {
 
-		/*
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Object[] getElements(Object inputElement) {
 			return ((List<Object>)inputElement).toArray();
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
@@ -255,9 +235,6 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
@@ -354,9 +331,6 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 		fFoldingCheckbox.setSelection(enabled);		
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.internal.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
-	 */
 	@Override
 	protected void handleDefaults() {
 		handleSyntaxColorListSelection();
@@ -423,12 +397,7 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 		gd.horizontalSpan= 2;
 		fItalicCheckBox.setLayoutData(gd);
 
-		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+		fHighlightingColorListViewer.addSelectionChangedListener(event -> handleSyntaxColorListSelection());
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSyntaxColorListSelection();
-			}
-		});
 
 		foregroundColorButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -584,9 +553,6 @@ public class AutoconfEditorPreferencePage extends AbstractEditorPreferencePage {
 		return (HighlightingColorListItem) selection.getFirstElement();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
 	@Override
 	public boolean performOk() {
 		return super.performOk();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/preferences/AutomakeEditorPreferencePage.java

@@ -21,11 +21,9 @@ import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -142,25 +140,16 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 	 */
 	private static class ColorListLabelProvider extends LabelProvider implements IColorProvider {
 
-		/*
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
 		@Override
 		public String getText(Object element) {
 			return ((HighlightingColorListItem)element).getDisplayName();
 		}
 		
-		/*
-		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-		 */
 		@Override
 		public Color getForeground(Object element) {
 			return ((HighlightingColorListItem)element).getItemColor();
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-		 */
 		@Override
 		public Color getBackground(Object element) {
 			return null;
@@ -174,25 +163,16 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 	 */
 	private static class ColorListContentProvider implements IStructuredContentProvider {
 
-		/*
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Object[] getElements(Object inputElement) {
 			return ((List<Object>)inputElement).toArray();
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 		}
 
-		/*
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
@@ -240,9 +220,6 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, mainKey + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		AutotoolsUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE);
@@ -293,9 +270,6 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 		fFoldingCheckbox.setSelection(enabled);		
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.internal.autotools.ui.preferences.AbstractAutomakeEditorPreferencePage#handleDefaults()
-	 */
 	@Override
 	protected void handleDefaults() {
 		handleSyntaxColorListSelection();
@@ -362,12 +336,7 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 		gd.horizontalSpan= 2;
 		fItalicCheckBox.setLayoutData(gd);
 
-		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+		fHighlightingColorListViewer.addSelectionChangedListener(event -> handleSyntaxColorListSelection());
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSyntaxColorListSelection();
-			}
-		});
 
 		foregroundColorButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -460,9 +429,6 @@ public class AutomakeEditorPreferencePage extends AbstractEditorPreferencePage {
 		return (HighlightingColorListItem) selection.getFirstElement();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
 	@Override
 	public boolean performOk() {
 		return super.performOk();

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/preferences/ColorEditor.java

@@ -13,8 +13,6 @@ package org.eclipse.cdt.internal.autotools.ui.preferences;
 
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
@@ -65,17 +63,14 @@ public class ColorEditor {
 			}
 		});
 		
-		fButton.addDisposeListener(new DisposeListener() {
+		fButton.addDisposeListener(event -> {
-			@Override
+			if (fImage != null) {
-			public void widgetDisposed(DisposeEvent event) {
+				fImage.dispose();
-				if (fImage != null)  {
+				fImage = null;
-					fImage.dispose();
+			}
-					fImage= null;
+			if (fColor != null) {
-				}
+				fColor.dispose();
-				if (fColor != null) {
+				fColor = null;
-					fColor.dispose();
-					fColor= null;
-				}
 			}
 		});
 	}

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsBuildPropertyPage.java

@@ -17,8 +17,6 @@ import org.eclipse.cdt.managedbuilder.ui.properties.AbstractCBuildPropertyTab;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
@@ -130,12 +128,9 @@ public class AutotoolsBuildPropertyPage extends AbstractCBuildPropertyTab {
 			}
 		});
 		
-		fCleanMakeTarget.addModifyListener(new ModifyListener() {
+		fCleanMakeTarget.addModifyListener(e -> {
-			@Override
+			if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
-			public void modifyText(ModifyEvent e) {
+				// FIXME: should probably issue warning here, but how?
-				if (fCleanMakeTarget.getText().equals("")) { // $NON-NLS-1$
-					// FIXME: should probably issue warning here, but how?
-				}
 			}
 		});
 		

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsConfigurePropertyTab.java

@@ -29,9 +29,7 @@ import org.eclipse.cdt.ui.newui.PageLayout;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.preference.IPreferencePageContainer;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
@@ -130,11 +128,7 @@ public class AutotoolsConfigurePropertyTab extends AbstractAutotoolsCPropertyTab
 
 	protected void createSelectionArea (Composite parent) {
 		fTree = new TreeViewer(parent, SWT.SINGLE|SWT.H_SCROLL|SWT.V_SCROLL|SWT.BORDER);
-		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
+		fTree.addSelectionChangedListener(event -> handleOptionSelection());
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleOptionSelection();
-			}});
 		fTree.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		// Create a temporary default AutotoolsConfiguration to use for label info
 		IAConfiguration tmp = AutotoolsConfigurationManager.getInstance().createDefaultConfiguration(getProject(), "");

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/text/hover/AutoconfTextHover.java

@@ -49,7 +49,6 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DefaultInformationControl;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextHover;
@@ -57,7 +56,6 @@ import org.eclipse.jface.text.ITextHoverExtension;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.Region;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PlatformUI;
@@ -506,9 +504,6 @@ public class AutoconfTextHover implements ITextHover, ITextHoverExtension {
 		return hoverInfo;
 	}
 
-	/*
-	 * @see ITextHover#getHoverRegion(ITextViewer, int)
-	 */
 	@Override
 	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 
@@ -535,26 +530,16 @@ public class AutoconfTextHover implements ITextHover, ITextHoverExtension {
 	 */
 	@Override
 	public IInformationControlCreator getHoverControlCreator() {
-		return new IInformationControlCreator() {
+		return parent -> new DefaultInformationControl(parent, getTooltipAffordanceString(),
-			@Override
+				new HTMLTextPresenter(false));
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
-						new HTMLTextPresenter(false));
-			}
-		};
 	}
 
 	/*
 	 * Static member function to allow content assist to add hover help.
 	 */
 	public static IInformationControlCreator getInformationControlCreator() {
-		return new IInformationControlCreator() {
+		return parent -> new DefaultInformationControl(parent, getTooltipAffordanceString(),
-			@Override
+				new HTMLTextPresenter(false));
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, getTooltipAffordanceString(),
-						new HTMLTextPresenter(false));
-			}
-		};
 	}
 
 	protected static String getTooltipAffordanceString() {

build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/CProjectPlatformPage.java

@@ -28,14 +28,10 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -125,13 +121,7 @@ public class CProjectPlatformPage extends WizardPage {
 		tableViewer = new CheckboxTableViewer(table);
 		tableViewer.setLabelProvider(new ConfigurationLabelProvider());
 		tableViewer.setContentProvider(new ConfigurationContentProvider());
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+		tableViewer.addSelectionChangedListener(e -> handleConfigurationSelectionChange());
-			@Override
-			public void selectionChanged(SelectionChangedEvent e) {
-				// will default to false until a selection is made
-				handleConfigurationSelectionChange();
-			}
-		});
 
 	}
 	
@@ -184,12 +174,7 @@ public class CProjectPlatformPage extends WizardPage {
 		platformSelection.setFont(composite.getFont());
 		platformSelection.setToolTipText(AutotoolsWizardMessages.getResourceString(TARGET_TIP));
 		platformSelection.setText("GNU Autotools"); //$NON-NLS-1$
-		platformSelection.addDisposeListener(new DisposeListener() {
+		platformSelection.addDisposeListener(e -> platformSelection = null);
-			@Override
-			public void widgetDisposed(DisposeEvent e) {
-				platformSelection = null;
-			}
-		});
 		
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		// Make this the same as NewCProjectWizardPage.SIZING_TEXT_FIELD_WIDTH
@@ -197,9 +182,6 @@ public class CProjectPlatformPage extends WizardPage {
 		platformSelection.setLayoutData(gd);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getProject()
-	 */
 	public IProject getProject() {
 		return ((NewCProjectWizard)getWizard()).getNewProject();
 	}