Bug 564416 - Use lambdas and method references cleanup on JDT UI code

For org.eclipse.jdt.ui.examples.javafamily

Change-Id: I3d8ae0d040fbf8bca96ddd39418f3e22c6bd6b12

4 files changed, 43 insertions, 72 deletions

diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
index e246515abd..352a30c5d2 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspSearchEngine.java
@@ -14,9 +14,7 @@
 package org.eclipse.jsp;
 
 import org.eclipse.core.indexsearch.IIndexQuery;
-import org.eclipse.core.indexsearch.ISearchResultCollector;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.search.IJavaSearchResultCollector;
 
@@ -29,12 +27,9 @@ public class JspSearchEngine {
 
 		JspUIPlugin.getDefault().search(
 			query,
-			new ISearchResultCollector() {
-				@Override
-				public void accept(IResource resource, int start, int length) throws CoreException {
-					System.out.println("  accept: " + resource); //$NON-NLS-1$
-					collector.accept(resource, start, start+length, null, 999);
-				}
+			(resource, start, length) -> {
+				System.out.println("  accept: " + resource); //$NON-NLS-1$
+				collector.accept(resource, start, start+length, null, 999);
 			},
 			pm
 		);
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
index 8e03f2afa5..17274d22ab 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/JspUIPlugin.java
@@ -31,8 +31,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceProxy;
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -79,22 +77,19 @@ public class JspUIPlugin extends AbstractUIPlugin implements IResourceChangeList
 			if (enable) {
 
 				IResourceProxyVisitor visitor=
-					new IResourceProxyVisitor() {
-						@Override
-						public boolean visit(IResourceProxy proxy) throws CoreException {
-							String name= proxy.getName();
-							int pos= name.lastIndexOf('.');
-							if (pos >= 0) {
-								String extension= name.substring(pos+1);
-								if (JSP_TYPE.equalsIgnoreCase(extension)) {
-									IResource r= proxy.requestResource();
-									if (r instanceof IFile)
-										jspAdded((IFile)r);
-								}
-							}
-							return true;
+					proxy -> {
+					String name= proxy.getName();
+					int pos= name.lastIndexOf('.');
+					if (pos >= 0) {
+						String extension= name.substring(pos+1);
+						if (JSP_TYPE.equalsIgnoreCase(extension)) {
+							IResource r= proxy.requestResource();
+							if (r instanceof IFile)
+								jspAdded((IFile)r);
 						}
-					};
+					}
+					return true;
+				};
 				try {
 					workspace.getRoot().accept(visitor, 0);
 				} catch (CoreException e) {
@@ -127,33 +122,30 @@ public class JspUIPlugin extends AbstractUIPlugin implements IResourceChangeList
 			return;
 		try {
 			d.accept(
-				new IResourceDeltaVisitor() {
-					@Override
-					public boolean visit(IResourceDelta delta) {
-						if (delta != null) {
-							IResource r= delta.getResource();
-							if (r instanceof IFile) {
-								IFile file= (IFile) r;
-								String type= file.getFileExtension();
-								if (JSP_TYPE.equalsIgnoreCase(type)) {
-									switch (delta.getKind()) {
-									case IResourceDelta.ADDED:
+				delta -> {
+					if (delta != null) {
+						IResource r= delta.getResource();
+						if (r instanceof IFile) {
+							IFile file= (IFile) r;
+							String type= file.getFileExtension();
+							if (JSP_TYPE.equalsIgnoreCase(type)) {
+								switch (delta.getKind()) {
+								case IResourceDelta.ADDED:
+									jspAdded(file);
+									break;
+								case IResourceDelta.REMOVED:
+									jspRemoved(file);
+									break;
+								case IResourceDelta.CHANGED:
+									// no need to index if the content has not changed
+									if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
 										jspAdded(file);
-										break;
-									case IResourceDelta.REMOVED:
-										jspRemoved(file);
-										break;
-									case IResourceDelta.CHANGED:
-										// no need to index if the content has not changed
-										if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
-											jspAdded(file);
-										break;
-									}
+									break;
 								}
 							}
 						}
-						return true;
 					}
+					return true;
 				}
 			);
 		} catch (CoreException e) {
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
index 2bf258351a..bbbe78b6d5 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/RenameTypeParticipant.java
@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
 
 import org.eclipse.core.indexsearch.ISearchResultCollector;
 
@@ -62,16 +61,13 @@ public class RenameTypeParticipant extends RenameParticipant {
 	public Change createChange(IProgressMonitor pm) throws CoreException {
 		final Map changes= new HashMap();
 		final String newName= computeNewName();
-		ISearchResultCollector collector= new ISearchResultCollector() {
-			@Override
-			public void accept(IResource resource, int start, int length) throws CoreException {
-				TextFileChange change= (TextFileChange)changes.get(resource);
-				if (change == null) {
-					change= new TextFileChange(resource.getName(), (IFile)resource);
-					changes.put(resource, change);
-				}
-				TextChangeCompatibility.addTextEdit(change, "Update type reference", new ReplaceEdit(start, length, newName)); //$NON-NLS-1$
+		ISearchResultCollector collector= (resource, start, length) -> {
+			TextFileChange change= (TextFileChange)changes.get(resource);
+			if (change == null) {
+				change= new TextFileChange(resource.getName(), (IFile)resource);
+				changes.put(resource, change);
 			}
+			TextChangeCompatibility.addTextEdit(change, "Update type reference", new ReplaceEdit(start, length, newName)); //$NON-NLS-1$
 		};
 		JspUIPlugin.getDefault().search(new JspTypeQuery(fType), collector, pm);
 
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
index cdf82c321c..5ff3ab0e33 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jsp/launching/TomcatTab.java
@@ -19,8 +19,6 @@ import java.io.File;
 import org.eclipse.jsp.JspPluginImages;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Font;
@@ -111,12 +109,7 @@ public class TomcatTab extends AbstractLaunchConfigurationTab {
 		gd.horizontalSpan = 2;
 		fTomcatDir.setLayoutData(gd);
 		fTomcatDir.setFont(font);
-		fTomcatDir.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
+		fTomcatDir.addModifyListener(evt -> updateLaunchConfigurationDialog());
 
 		fBrowseButton = createPushButton(composite, LaunchingMessages.TomcatTab_21, null);
 		fBrowseButton.addSelectionListener(new SelectionAdapter() {
@@ -140,12 +133,7 @@ public class TomcatTab extends AbstractLaunchConfigurationTab {
 		gd.horizontalSpan = 2;
 		fProjectText.setLayoutData(gd);
 		fProjectText.setFont(font);
-		fProjectText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
+		fProjectText.addModifyListener(evt -> updateLaunchConfigurationDialog());
 
 		fProjectButton = createPushButton(composite, LaunchingMessages.TomcatTab_23, null);
 		fProjectButton.addSelectionListener(new SelectionAdapter() {