Bug 530751 - Use lambdas in org.eclipse.searchI20180206-0315I20180205-2000

Part 2

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

9 files changed, 75 insertions, 162 deletions

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java
index ade38dfb8c4..0afb4226aee 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java
@@ -85,12 +85,7 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg
 		localMenu.addMenuListener(new MenuAdapter() {
 			@Override
 			public void menuHidden(MenuEvent e) {
-				e.display.asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						localMenu.dispose();
-					}
-				});
+				e.display.asyncExec(() -> localMenu.dispose());
 			}
 		});
 
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
index 996f7bc994f..ca821fbd4c6 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java
@@ -52,14 +52,11 @@ class RemoveResultAction extends Action {
 	public void run() {
 		final IMarker[] markers= getMarkers(fSelectionProvider.getSelection());
 		if (markers != null) {
-			BusyIndicator.showWhile(SearchPlugin.getActiveWorkbenchShell().getDisplay(), new Runnable() {
-				@Override
-				public void run() {
-					try {
-						SearchPlugin.getWorkspace().deleteMarkers(markers);
-					} catch (CoreException ex) {
-						ExceptionHandler.handle(ex, SearchMessages.Search_Error_deleteMarkers_title, SearchMessages.Search_Error_deleteMarkers_message);
-					}
+			BusyIndicator.showWhile(SearchPlugin.getActiveWorkbenchShell().getDisplay(), () -> {
+				try {
+					SearchPlugin.getWorkspace().deleteMarkers(markers);
+				} catch (CoreException ex) {
+					ExceptionHandler.handle(ex, SearchMessages.Search_Error_deleteMarkers_title, SearchMessages.Search_Error_deleteMarkers_message);
 				}
 			});
 		}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
index d0503cad20d..eb034aeff92 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -23,8 +23,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
-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.events.SelectionListener;
@@ -62,9 +60,7 @@ import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.SafeRunnable;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -342,12 +338,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 				super.create();
 				final CheckboxTableViewer viewer= getViewer();
 				final Button okButton= this.getOkButton();
-				viewer.addCheckStateListener(new ICheckStateListener() {
-					@Override
-					public void checkStateChanged(CheckStateChangedEvent event) {
-						okButton.setEnabled(viewer.getCheckedElements().length > 0);
-					}
-				});
+				viewer.addCheckStateListener(event -> okButton.setEnabled(viewer.getCheckedElements().length > 0));
 				SelectionListener listener = new SelectionAdapter() {
 					@Override
 					public void widgetSelected(SelectionEvent e) {
@@ -381,12 +372,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 			close();
 			if (display != null && !display.isDisposed()) {
 				display.asyncExec(
-						new Runnable() {
-							@Override
-							public void run() {
-								new OpenSearchDialogAction().run();
-							}
-						});
+						() -> new OpenSearchDialogAction().run());
 			}
 		}
 		destroyImages(createdImages);
@@ -447,13 +433,10 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 			final CTabItem item = new CTabItem(folder, SWT.NONE);
 			item.setData("descriptor", descriptor); //$NON-NLS-1$
 			item.setText(descriptor.getLabel());
-			item.addDisposeListener(new DisposeListener() {
-				@Override
-				public void widgetDisposed(DisposeEvent e) {
-					item.setData("descriptor", null); //$NON-NLS-1$
-					if (item.getImage() != null)
-						item.getImage().dispose();
-				}
+			item.addDisposeListener(e -> {
+				item.setData("descriptor", null); //$NON-NLS-1$
+				if (item.getImage() != null)
+					item.getImage().dispose();
 			});
 			ImageDescriptor imageDesc= descriptor.getImage();
 			if (imageDesc != null)
@@ -757,29 +740,24 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 
 		applyDialogFont(pageWrapper);
 
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
+		BusyIndicator.showWhile(getShell().getDisplay(), () -> SafeRunner.run(new ISafeRunnable() {
 			@Override
-			public void run() {
-				SafeRunner.run(new ISafeRunnable() {
-					@Override
-					public void run() throws Exception {
-						// create page and control
-						ISearchPage page= descriptor.createObject(SearchDialog.this);
-						if (page != null) {
-							page.createControl(pageWrapper);
-						}
-					}
-					@Override
-					public void handleException(Throwable ex) {
-						if (ex instanceof CoreException) {
-							ExceptionHandler.handle((CoreException) ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
-						} else {
-							ExceptionHandler.displayMessageDialog(ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
-						}
-					}
-				});
+			public void run() throws Exception {
+				// create page and control
+				ISearchPage page= descriptor.createObject(SearchDialog.this);
+				if (page != null) {
+					page.createControl(pageWrapper);
+				}
 			}
-		});
+			@Override
+			public void handleException(Throwable ex) {
+				if (ex instanceof CoreException) {
+					ExceptionHandler.handle((CoreException) ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
+				} else {
+					ExceptionHandler.displayMessageDialog(ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
+				}
+			}
+		}));
 
 		ISearchPage page= descriptor.getPage();
 		if (page == null || page.getControl() == null) {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java
index 35c7f62b93c..31cf1e0df07 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java
@@ -236,12 +236,7 @@ public class SearchManager implements IResourceChangeListener {
 			if (display != null && !display.isDisposed()) {
 				final String warningTitle= SearchMessages.SearchManager_resourceChangedWarning;
 				final String warningMsg= warningMessage;
-				display.syncExec(new Runnable() {
-					@Override
-					public void run() {
-						MessageDialog.openWarning(getShell(), warningTitle, warningMsg);
-					}
-				});
+				display.syncExec(() -> MessageDialog.openWarning(getShell(), warningTitle, warningMsg));
 			}
 		}
 
@@ -251,20 +246,17 @@ public class SearchManager implements IResourceChangeListener {
 			final Viewer visibleViewer= ((SearchResultView)SearchUI.getSearchResultView()).getViewer();
 			while (iter2.hasNext()) {
 				final SearchResultViewer viewer= iter2.next();
-				display.syncExec(new Runnable() {
-					@Override
-					public void run() {
-						if (previousSearch != null && viewer == visibleViewer)
-							previousSearch.setSelection(viewer.getSelection());
-						viewer.setInput(null);
-						viewer.setPageId(search.getPageId());
-						viewer.setGotoMarkerAction(search.getGotoMarkerAction());
-						viewer.setContextMenuTarget(search.getContextMenuContributor());
-						viewer.setActionGroupFactory(null);
-						viewer.setInput(getCurrentResults());
-						viewer.setActionGroupFactory(search.getActionGroupFactory());
-						viewer.setSelection(fCurrentSearch.getSelection(), true);
-					}
+				display.syncExec(() -> {
+					if (previousSearch != null && viewer == visibleViewer)
+						previousSearch.setSelection(viewer.getSelection());
+					viewer.setInput(null);
+					viewer.setPageId(search.getPageId());
+					viewer.setGotoMarkerAction(search.getGotoMarkerAction());
+					viewer.setContextMenuTarget(search.getContextMenuContributor());
+					viewer.setActionGroupFactory(null);
+					viewer.setInput(getCurrentResults());
+					viewer.setActionGroupFactory(search.getActionGroupFactory());
+					viewer.setSelection(fCurrentSearch.getSelection(), true);
 				});
 			}
 		}
@@ -302,13 +294,10 @@ public class SearchManager implements IResourceChangeListener {
 			final Viewer visibleViewer= ((SearchResultView)SearchUI.getSearchResultView()).getViewer();
 			while (iter.hasNext()) {
 				final SearchResultViewer viewer= iter.next();
-				display.syncExec(new Runnable() {
-					@Override
-					public void run() {
-						if (fCurrentSearch != null && viewer == visibleViewer)
-							fCurrentSearch.setSelection(viewer.getSelection());
-						setNewSearch(viewer, newSearch);
-					}
+				display.syncExec(() -> {
+					if (fCurrentSearch != null && viewer == visibleViewer)
+						fCurrentSearch.setSelection(viewer.getSelection());
+					setNewSearch(viewer, newSearch);
 				});
 			}
 		}
@@ -341,12 +330,7 @@ public class SearchManager implements IResourceChangeListener {
 		if (Thread.currentThread() == display.getThread())
 			handleNewSearchResult();
 		else {
-			display.syncExec(new Runnable() {
-				@Override
-				public void run() {
-					handleNewSearchResult();
-				}
-			});
+			display.syncExec(() -> handleNewSearchResult());
 		}
 		SearchPlugin.getWorkspace().addResourceChangeListener(this);
 	}
@@ -473,18 +457,15 @@ public class SearchManager implements IResourceChangeListener {
 		if (display == null || display.isDisposed())
 			return;
 
-		Runnable runnable= new Runnable() {
-			@Override
-			public void run() {
-				if (getCurrentSearch() != null) {
-					handleSearchMarkersChanged(markerDeltas);
-					// update title and actions
-					Iterator<SearchResultViewer> iter= fListeners.iterator();
-					while (iter.hasNext()) {
-						SearchResultViewer viewer= iter.next();
-						viewer.enableActions();
-						viewer.updateTitle();
-					}
+		Runnable runnable= () -> {
+			if (getCurrentSearch() != null) {
+				handleSearchMarkersChanged(markerDeltas);
+				// update title and actions
+				Iterator<SearchResultViewer> iter= fListeners.iterator();
+				while (iter.hasNext()) {
+					SearchResultViewer viewer= iter.next();
+					viewer.enableActions();
+					viewer.updateTitle();
 				}
 			}
 		};
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
index 74e11066afc..3bab1961eec 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
@@ -113,12 +113,7 @@ public class SearchPlugin extends AbstractUIPlugin {
 		IWorkbenchWindow window= fgSearchPlugin.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null) {
 			final WindowRef windowRef= new WindowRef();
-			Display.getDefault().syncExec(new Runnable() {
-				@Override
-				public void run() {
-					setActiveWorkbenchWindow(windowRef);
-				}
-			});
+			Display.getDefault().syncExec(() -> setActiveWorkbenchWindow(windowRef));
 			return windowRef.window;
 		}
 		return window;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java
index f05bdcf7259..65d8fcf4fc2 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java
@@ -31,7 +31,6 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
@@ -111,13 +110,10 @@ public class SearchResultView extends ViewPart implements ISearchResultView {
 
 		fillActionBars(getViewSite().getActionBars());
 
-		fPropertyChangeListener= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				if (SearchPreferencePage.POTENTIAL_MATCH_FG_COLOR.equals(event.getProperty()) || SearchPreferencePage.EMPHASIZE_POTENTIAL_MATCHES.equals(event.getProperty()))
-					if (fViewer != null)
-						fViewer.updatedPotentialMatchFgColor();
-			}
+		fPropertyChangeListener= event -> {
+			if (SearchPreferencePage.POTENTIAL_MATCH_FG_COLOR.equals(event.getProperty()) || SearchPreferencePage.EMPHASIZE_POTENTIAL_MATCHES.equals(event.getProperty()))
+				if (fViewer != null)
+					fViewer.updatedPotentialMatchFgColor();
 		};
 
 		SearchPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPropertyChangeListener);
@@ -200,12 +196,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView {
 
 	private void setGotoMarkerAction(final IAction gotoMarkerAction) {
 		// Make sure we are doing it in the right thread.
-		getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				getViewer().setGotoMarkerAction(gotoMarkerAction);
-			}
-		});
+		getDisplay().syncExec(() -> getViewer().setGotoMarkerAction(gotoMarkerAction));
 	}
 
 
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
index 9df5c73eef4..53aac20a825 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
@@ -38,7 +38,6 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
@@ -46,13 +45,9 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IOpenListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 
@@ -144,33 +139,22 @@ public class SearchResultViewer extends TableViewer {
 		fCopyToClipboardAction= new CopyToClipboardAction(this);
 
 		addSelectionChangedListener(
-			new ISelectionChangedListener() {
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					if (fLastSelection == null || !fLastSelection.equals(event.getSelection())) {
-						fLastSelection= event.getSelection();
-						handleSelectionChanged();
-					}
+			event -> {
+				if (fLastSelection == null || !fLastSelection.equals(event.getSelection())) {
+					fLastSelection= event.getSelection();
+					handleSelectionChanged();
 				}
 			}
 		);
 
-		addOpenListener(new IOpenListener() {
-			@Override
-			public void open(OpenEvent event) {
-				showResult();
-			}
-		});
+		addOpenListener(event -> showResult());
 
 		MenuManager menuMgr= new MenuManager("#PopUp"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
 		menuMgr.addMenuListener(
-			new IMenuListener() {
-				@Override
-				public void menuAboutToShow(IMenuManager mgr) {
-					SearchPlugin.createStandardGroups(mgr);
-					fillContextMenu(mgr);
-				}
+			mgr -> {
+				SearchPlugin.createStandardGroups(mgr);
+				fillContextMenu(mgr);
 			});
 		Menu menu= menuMgr.createContextMenu(getTable());
 		getTable().setMenu(menu);
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
index 30246108e82..8d9166a8ea9 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
@@ -110,12 +110,7 @@ class SortDropDownAction extends Action implements IMenuCreator {
 					public void run() {
 						if (!checkedId.equals(sorterDesc.getId())) {
 							SortDropDownAction.this.setChecked(sorterDesc);
-							BusyIndicator.showWhile(parent.getDisplay(), new Runnable() {
-								@Override
-								public void run() {
-									fViewer.setSorter(sorter);
-								}
-							});
+							BusyIndicator.showWhile(parent.getDisplay(), () -> fViewer.setSorter(sorter));
 						}
 					}
 				};
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java
index e3fe7252591..9e42f1f577f 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java
@@ -38,16 +38,13 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener
 	private final static String TYPE_DELIMITER= SearchMessages.FileTypeEditor_typeDelimiter;
 	public final static String FILE_PATTERN_NEGATOR= "!"; //$NON-NLS-1$
 
-	private static final Comparator<String> FILE_TYPES_COMPARATOR= new Comparator<String>() {
-		@Override
-		public int compare(String fp1, String fp2) {
-			boolean isNegative1= fp1.startsWith(FILE_PATTERN_NEGATOR);
-			boolean isNegative2= fp2.startsWith(FILE_PATTERN_NEGATOR);
-			if (isNegative1 != isNegative2) {
-				return isNegative1 ? 1 : -1;
-			}
-			return fp1.compareTo(fp2);
+	private static final Comparator<String> FILE_TYPES_COMPARATOR= (fp1, fp2) -> {
+		boolean isNegative1= fp1.startsWith(FILE_PATTERN_NEGATOR);
+		boolean isNegative2= fp2.startsWith(FILE_PATTERN_NEGATOR);
+		if (isNegative1 != isNegative2) {
+			return isNegative1 ? 1 : -1;
 		}
+		return fp1.compareTo(fp2);
 	};
 
 	public FileTypeEditor(Combo textField, Button browseButton) {