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

For search, util

Change-Id: I397bdc42f3fe8ffdac66f14c282482890df55899
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

8 files changed, 18 insertions, 54 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java
index 56a4ce52fe..34de36a25e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java
@@ -20,8 +20,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.AccessibleAdapter;
 import org.eclipse.swt.accessibility.AccessibleEvent;
-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.layout.GridData;
@@ -615,13 +613,10 @@ public class JavaSearchPage extends DialogPage implements ISearchPage {
 				updateOKStatus();
 			}
 		});
-		fPattern.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doPatternModified();
-				updateOKStatus();
+		fPattern.addModifyListener(e -> {
+			doPatternModified();
+			updateOKStatus();
 
-			}
 		});
 		TextFieldNavigationHandler.install(fPattern);
 		GridData data= new GridData(GridData.FILL, GridData.FILL, true, false, 1, 1);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultPage.java
index 3a06bcc955..ee72bbb36d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchResultPage.java
@@ -157,12 +157,7 @@ public class JavaSearchResultPage extends AbstractTextSearchViewPage implements
 	private int fCurrentGrouping;
 
 	private static final String[] SHOW_IN_TARGETS= new String[] { JavaUI.ID_PACKAGES  };
-	public static final IShowInTargetList SHOW_IN_TARGET_LIST= new IShowInTargetList() {
-		@Override
-		public String[] getShowInTargetIds() {
-			return SHOW_IN_TARGETS;
-		}
-	};
+	public static final IShowInTargetList SHOW_IN_TARGET_LIST= () -> SHOW_IN_TARGETS;
 
 	private JavaSearchEditorOpener fEditorOpener= new JavaSearchEditorOpener();
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/OccurrencesSearchResultPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/OccurrencesSearchResultPage.java
index eadda1ef39..cf7640d982 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/OccurrencesSearchResultPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/OccurrencesSearchResultPage.java
@@ -346,12 +346,7 @@ public class OccurrencesSearchResultPage extends AbstractTextSearchViewPage {
 			OccurrencesSearchResult result= (OccurrencesSearchResult) query.getSearchResult();
 			final JavaElementLine line= getMatchingLine(result, offset, length);
 
-			getSite().getShell().getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					setInput(query.getSearchResult(), line == null ? null : new StructuredSelection(line));
-				}
-			});
+			getSite().getShell().getDisplay().asyncExec(() -> setInput(query.getSearchResult(), line == null ? null : new StructuredSelection(line)));
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchLabelProvider.java
index 4a1339a35e..a5f8a614dc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchLabelProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SearchLabelProvider.java
@@ -78,12 +78,7 @@ public abstract class SearchLabelProvider extends AppearanceAwareLabelProvider {
 		fLabelProviderMap= new HashMap<>(5);
 
 		fSearchPreferences= new ScopedPreferenceStore(InstanceScope.INSTANCE, NewSearchUI.PLUGIN_ID);
-		fSearchPropertyListener= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				doSearchPropertyChange(event);
-			}
-		};
+		fSearchPropertyListener= event -> doSearchPropertyChange(event);
 		fSearchPreferences.addPropertyChangeListener(fSearchPropertyListener);
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SortAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SortAction.java
index 2c29bd0cc9..191e6d14ba 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SortAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/SortAction.java
@@ -30,12 +30,7 @@ public class SortAction extends Action {
 
 	@Override
 	public void run() {
-		BusyIndicator.showWhile(fPage.getViewer().getControl().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				fPage.setSortOrder(fSortOrder);
-			}
-		});
+		BusyIndicator.showWhile(fPage.getViewer().getControl().getDisplay(), () -> fPage.setSortOrder(fSortOrder));
 	}
 
 	public int getSortOrder() {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
index b0fac00e5c..365f6285a4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/CoreUtility.java
@@ -98,14 +98,11 @@ public class CoreUtility {
 		} else {
 			final Object[] ret = new Object[1];
 			final CoreException[] exc = new CoreException[1];
-			BusyIndicator.showWhile(null, new Runnable() {
-				@Override
-				public void run() {
-					try {
-						ret[0] = element.createExecutableExtension(classAttribute);
-					} catch (CoreException e) {
-						exc[0] = e;
-					}
+			BusyIndicator.showWhile(null, () -> {
+				try {
+					ret[0] = element.createExecutableExtension(classAttribute);
+				} catch (CoreException e) {
+					exc[0] = e;
 				}
 			});
 			if (exc[0] != null)
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/MainMethodSearchEngine.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/MainMethodSearchEngine.java
index ead9080554..75e146855a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/MainMethodSearchEngine.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/MainMethodSearchEngine.java
@@ -127,14 +127,11 @@ public class MainMethodSearchEngine{
 
 		final IType[][] res= new IType[1][];
 
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			@Override
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				try {
-					res[0]= searchMainMethods(pm, scope, style);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
+		IRunnableWithProgress runnable= pm -> {
+			try {
+				res[0]= searchMainMethods(pm, scope, style);
+			} catch (CoreException e) {
+				throw new InvocationTargetException(e);
 			}
 		};
 		context.run(true, true, runnable);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
index 44cb6282b6..c3aaa9a1e2 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SelectionUtil.java
@@ -113,12 +113,7 @@ public class SelectionUtil {
 			if (target != null) {
 				// select and reveal resource
 				final ISetSelectionTarget finalTarget= target;
-				window.getShell().getDisplay().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						finalTarget.selectReveal(selection);
-					}
-				});
+				window.getShell().getDisplay().asyncExec(() -> finalTarget.selectReveal(selection));
 			}
 		}
 	}