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

For wizard

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

7 files changed, 55 insertions, 130 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
index 55c7b2175b..efdb87b7ab 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/AbstractWorkingSetWizardPage.java
@@ -17,8 +17,6 @@ import java.util.Arrays;
 import java.util.HashSet;
 
 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.layout.GridData;
@@ -38,12 +36,8 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -170,12 +164,7 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 		fWorkingSetName= new Text(composite, SWT.SINGLE | SWT.BORDER);
 		fWorkingSetName.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
 		fWorkingSetName.addModifyListener(
-			new ModifyListener() {
-				@Override
-				public void modifyText(ModifyEvent e) {
-					validateInput();
-				}
-			}
+			e -> validateInput()
 		);
 
 		Composite leftCenterRightComposite= new Composite(composite, SWT.NONE);
@@ -274,12 +263,7 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 		removeAllButton.setText(WorkingSetMessages.JavaWorkingSetPage_removeAll_button);
 		removeAllButton.setEnabled(!fSelectedElements.isEmpty());
 
-		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				addButton.setEnabled(!event.getSelection().isEmpty());
-			}
-		});
+		fTree.addSelectionChangedListener(event -> addButton.setEnabled(!event.getSelection().isEmpty()));
 
 		addButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -291,22 +275,14 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 			}
 		});
 
-		fTree.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				addTreeSelection();
+		fTree.addDoubleClickListener(event -> {
+			addTreeSelection();
 
-				removeAllButton.setEnabled(true);
-				addAllButton.setEnabled(fTree.getTree().getItems().length > 0);
-			}
+			removeAllButton.setEnabled(true);
+			addAllButton.setEnabled(fTree.getTree().getItems().length > 0);
 		});
 
-		fTable.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				removeButton.setEnabled(!event.getSelection().isEmpty());
-			}
-		});
+		fTable.addSelectionChangedListener(event -> removeButton.setEnabled(!event.getSelection().isEmpty()));
 
 		removeButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -318,14 +294,11 @@ public abstract class AbstractWorkingSetWizardPage extends WizardPage implements
 			}
 		});
 
-		fTable.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				removeTableSelection();
+		fTable.addDoubleClickListener(event -> {
+			removeTableSelection();
 
-				addAllButton.setEnabled(true);
-				removeAllButton.setEnabled(!fSelectedElements.isEmpty());
-			}
+			addAllButton.setEnabled(true);
+			removeAllButton.setEnabled(!fSelectedElements.isEmpty());
 		});
 
 		addAllButton.addSelectionListener(new SelectionAdapter() {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
index 133eea4d93..3d17763e60 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ConfigureWorkingSetAssignementAction.java
@@ -45,9 +45,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -456,18 +454,15 @@ public final class ConfigureWorkingSetAssignementAction extends SelectionDispatc
 		protected CheckboxTableViewer createTableViewer(Composite parent) {
 
 			final CheckboxTableViewer result= CheckboxTableViewer.newCheckList(parent, SWT.BORDER | SWT.MULTI);
-			result.addCheckStateListener(new ICheckStateListener() {
-				@Override
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					GrayedCheckedModelElement element= (GrayedCheckedModelElement)event.getElement();
-					result.setGrayed(element, false);
-					if (event.getChecked()) {
-						element.select();
-					} else {
-						element.deselect();
-					}
-					result.update(element, null);
+			result.addCheckStateListener(event -> {
+				GrayedCheckedModelElement element= (GrayedCheckedModelElement)event.getElement();
+				result.setGrayed(element, false);
+				if (event.getChecked()) {
+					element.select();
+				} else {
+					element.deselect();
 				}
+				result.update(element, null);
 			});
 			GridData data= new GridData(GridData.FILL_BOTH);
 			data.heightHint= convertHeightInCharsToPixels(20);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
index 3560e93ee7..9bf4b99317 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java
@@ -193,37 +193,34 @@ public class JavaWorkingSetPage extends AbstractWorkingSetWizardPage {
 
 	private Object[] getInitialTreeSelection() {
 		final Object[][] result= new Object[1][];
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				IStructuredSelection selection= fInitialSelection;
-				if (selection == null) {
-
-					IWorkbenchPage page= JavaPlugin.getActivePage();
-					if (page == null)
-						return;
-
-					IWorkbenchPart part= page.getActivePart();
-					if (part == null)
-						return;
-
-					try {
-						selection= SelectionConverter.getStructuredSelection(part);
-					} catch (JavaModelException e) {
-						return;
-					}
+		BusyIndicator.showWhile(getShell().getDisplay(), () -> {
+			IStructuredSelection selection= fInitialSelection;
+			if (selection == null) {
+
+				IWorkbenchPage page= JavaPlugin.getActivePage();
+				if (page == null)
+					return;
+
+				IWorkbenchPart part= page.getActivePart();
+				if (part == null)
+					return;
+
+				try {
+					selection= SelectionConverter.getStructuredSelection(part);
+				} catch (JavaModelException e) {
+					return;
 				}
+			}
 
-				Object[] elements= selection.toArray();
-				for (int i= 0; i < elements.length; i++) {
-					if (elements[i] instanceof IResource) {
-						IJavaElement je= ((IResource)elements[i]).getAdapter(IJavaElement.class);
-						if (je != null && je.exists() &&  je.getJavaProject().isOnClasspath((IResource)elements[i]))
-							elements[i]= je;
-					}
+			Object[] elements= selection.toArray();
+			for (int i= 0; i < elements.length; i++) {
+				if (elements[i] instanceof IResource) {
+					IJavaElement je= ((IResource)elements[i]).getAdapter(IJavaElement.class);
+					if (je != null && je.exists() &&  je.getJavaProject().isOnClasspath((IResource)elements[i]))
+						elements[i]= je;
 				}
-				result[0]= elements;
 			}
+			result[0]= elements;
 		});
 
 		if (result[0] == null)
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ViewActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ViewActionGroup.java
index 091c815d3c..5091ec0141 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ViewActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/ViewActionGroup.java
@@ -58,10 +58,7 @@ public class ViewActionGroup extends ActionGroup {
 		fChangeListener= changeListener;
 		fSite= site;
 		if (fChangeListener == null) {
-			fChangeListener = new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {}
-			};
+			fChangeListener = event -> {};
 		}
 		fFilterActionGroup= new WorkingSetFilterActionGroup(site, fChangeListener);
 		fShowActionGroup= new WorkingSetShowActionGroup(site);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
index 0f77b2c610..b06d210545 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetConfigurationDialog.java
@@ -42,16 +42,10 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 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.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
@@ -212,12 +206,7 @@ public class WorkingSetConfigurationDialog extends SelectionDialog {
 
 	private void createTableViewer(Composite parent) {
 		fTableViewer= CheckboxTableViewer.newCheckList(parent, SWT.BORDER | SWT.MULTI);
-		fTableViewer.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateButtonAvailability();
-			}
-		});
+		fTableViewer.addCheckStateListener(event -> updateButtonAvailability());
 		GridData data= new GridData(GridData.FILL_BOTH);
 		data.heightHint= convertHeightInCharsToPixels(20);
 		data.widthHint= convertWidthInCharsToPixels(50);
@@ -225,18 +214,10 @@ public class WorkingSetConfigurationDialog extends SelectionDialog {
 
 		fTableViewer.setLabelProvider(new WorkingSetLabelProvider());
 		fTableViewer.setContentProvider(ArrayContentProvider.getInstance());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSelectionChanged();
-			}
-		});
-		fTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				if (fEditButton.isEnabled())
-					editSelectedWorkingSet();
-			}
+		fTableViewer.addSelectionChangedListener(event -> handleSelectionChanged());
+		fTableViewer.addDoubleClickListener(event -> {
+			if (fEditButton.isEnabled())
+				editSelectedWorkingSet();
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
index 583fa7b44e..3300d111eb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
@@ -82,12 +82,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup implements IWorking
 		fSelectWorkingSetAction= new SelectWorkingSetAction(this, site);
 		fEditWorkingSetAction= new EditWorkingSetAction(this, site);
 
-		fWorkingSetListener= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				doPropertyChange(event);
-			}
-		};
+		fWorkingSetListener= event -> doPropertyChange(event);
 		fWorkingSetFilter= new WorkingSetFilter();
 
 		IWorkingSetManager manager= PlatformUI.getWorkbench().getWorkingSetManager();
@@ -109,12 +104,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup implements IWorking
 		fSelectWorkingSetAction= new SelectWorkingSetAction(this, shell);
 		fEditWorkingSetAction= new EditWorkingSetAction(this, shell);
 
-		fWorkingSetListener= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				doPropertyChange(event);
-			}
-		};
+		fWorkingSetListener= event -> doPropertyChange(event);
 
 		fWorkingSetFilter= new WorkingSetFilter();
 
@@ -232,12 +222,9 @@ public class WorkingSetFilterActionGroup extends ActionGroup implements IWorking
 		add(mm, new Separator(LRU_GROUP));
 
 		fMenuManager= mm;
-		fMenuListener= new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				removePreviousLRUWorkingSetActions(manager);
-				addLRUWorkingSetActions(manager);
-			}
+		fMenuListener= manager -> {
+			removePreviousLRUWorkingSetActions(manager);
+			addLRUWorkingSetActions(manager);
 		};
 		fMenuManager.addMenuListener(fMenuListener);
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
index 885763f2cd..a89492ca8d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java
@@ -278,12 +278,7 @@ public class WorkingSetModel {
 
 	private void addListenersToWorkingSetManagers() {
 		fListeners= new ListenerList<>(ListenerList.IDENTITY);
-		fWorkingSetManagerListener= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				workingSetManagerChanged(event);
-			}
-		};
+		fWorkingSetManagerListener= event -> workingSetManagerChanged(event);
 		PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(fWorkingSetManagerListener);
 		fLocalWorkingSetManager.addPropertyChangeListener(fWorkingSetManagerListener);
 	}