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

For packages, browinig, callhierarchy and javadocexport

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

28 files changed, 191 insertions, 484 deletions

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingContentProvider.java
index 4182825947..abe3a8c438 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingContentProvider.java
@@ -375,24 +375,18 @@ class JavaBrowsingContentProvider extends StandardJavaElementContentProvider imp
 	 * Updates the package icon
 	 */
 	 private void postUpdateIcon(final IJavaElement element) {
-	 	postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.update(element, new String[]{IBasicPropertyConstants.P_IMAGE});
-			}
+	 	postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.update(element, new String[]{IBasicPropertyConstants.P_IMAGE});
 		});
 	 }
 
 	private void postRefresh(final Object root, final boolean updateLabels) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed())
-					fViewer.refresh(root, updateLabels);
-			}
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed())
+				fViewer.refresh(root, updateLabels);
 		});
 	}
 
@@ -408,28 +402,25 @@ class JavaBrowsingContentProvider extends StandardJavaElementContentProvider imp
 		if (elements == null || elements.length <= 0)
 			return;
 
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					Object[] newElements= getNewElements(elements);
-					if (fViewer instanceof AbstractTreeViewer) {
-						if (fViewer.testFindItem(parent) == null) {
-							Object root= ((AbstractTreeViewer)fViewer).getInput();
-							if (root != null)
-								((AbstractTreeViewer)fViewer).add(root, newElements);
-						}
-						else
-							((AbstractTreeViewer)fViewer).add(parent, newElements);
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				Object[] newElements= getNewElements(elements);
+				if (fViewer instanceof AbstractTreeViewer) {
+					if (fViewer.testFindItem(parent) == null) {
+						Object root= ((AbstractTreeViewer)fViewer).getInput();
+						if (root != null)
+							((AbstractTreeViewer)fViewer).add(root, newElements);
 					}
-					else if (fViewer instanceof ListViewer)
-						((ListViewer)fViewer).add(newElements);
-					else if (fViewer instanceof TableViewer)
-						((TableViewer)fViewer).add(newElements);
-					if (fViewer.testFindItem(elements[0]) != null)
-						fBrowsingPart.adjustInputAndSetSelection(elements[0]);
+					else
+						((AbstractTreeViewer)fViewer).add(parent, newElements);
 				}
+				else if (fViewer instanceof ListViewer)
+					((ListViewer)fViewer).add(newElements);
+				else if (fViewer instanceof TableViewer)
+					((TableViewer)fViewer).add(newElements);
+				if (fViewer.testFindItem(elements[0]) != null)
+					fBrowsingPart.adjustInputAndSetSelection(elements[0]);
 			}
 		});
 	}
@@ -453,32 +444,26 @@ class JavaBrowsingContentProvider extends StandardJavaElementContentProvider imp
 		if (elements.length <= 0)
 			return;
 
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					if (fViewer instanceof AbstractTreeViewer)
-						((AbstractTreeViewer)fViewer).remove(elements);
-					else if (fViewer instanceof ListViewer)
-						((ListViewer)fViewer).remove(elements);
-					else if (fViewer instanceof TableViewer)
-						((TableViewer)fViewer).remove(elements);
-				}
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				if (fViewer instanceof AbstractTreeViewer)
+					((AbstractTreeViewer)fViewer).remove(elements);
+				else if (fViewer instanceof ListViewer)
+					((ListViewer)fViewer).remove(elements);
+				else if (fViewer instanceof TableViewer)
+					((TableViewer)fViewer).remove(elements);
 			}
 		});
 	}
 
 	private void postAdjustInputAndSetSelection(final Object element) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					ctrl.setRedraw(false);
-					fBrowsingPart.adjustInputAndSetSelection(element);
-					ctrl.setRedraw(true);
-				}
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				ctrl.setRedraw(false);
+				fBrowsingPart.adjustInputAndSetSelection(element);
+				ctrl.setRedraw(true);
 			}
 		});
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingPart.java
index c32812f0e2..c31401b98d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/JavaBrowsingPart.java
@@ -410,14 +410,9 @@ abstract class JavaBrowsingPart extends ViewPart implements IMenuListener, IView
 	 * @return returns the <code>IShowInSource</code>
 	 */
 	protected IShowInSource getShowInSource() {
-		return new IShowInSource() {
-			@Override
-			public ShowInContext getShowInContext() {
-				return new ShowInContext(
-					null,
-				getSite().getSelectionProvider().getSelection());
-			}
-		};
+		return () -> new ShowInContext(
+			null,
+		getSite().getSelectionProvider().getSelection());
 	}
 
 	protected DecoratingJavaLabelProvider createDecoratingLabelProvider(JavaUILabelProvider provider) {
@@ -579,12 +574,7 @@ abstract class JavaBrowsingPart extends ViewPart implements IMenuListener, IView
 		if (fHasWorkingSetFilter) {
 			String viewId= getConfigurationElement().getAttribute("id"); //$NON-NLS-1$
 			Assert.isNotNull(viewId);
-			IPropertyChangeListener workingSetListener= new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					doWorkingSetChanged(event);
-				}
-			};
+			IPropertyChangeListener workingSetListener= event -> doWorkingSetChanged(event);
 			fWorkingSetFilterActionGroup= new WorkingSetFilterActionGroup(getSite(), workingSetListener);
 			fViewer.addFilter(fWorkingSetFilterActionGroup.getWorkingSetFilter());
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/MembersView.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/MembersView.java
index 39f9447749..54249db2f4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/MembersView.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/MembersView.java
@@ -19,8 +19,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -74,13 +72,7 @@ public class MembersView extends JavaBrowsingPart implements IPropertyChangeList
 	@Override
 	public <T> T getAdapter(Class<T> key) {
 		if (key == IShowInTargetList.class) {
-			return (T) new IShowInTargetList() {
-				@Override
-				public String[] getShowInTargetIds() {
-					return new String[] { JavaUI.ID_PACKAGES };
-				}
-
-			};
+			return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES };
 		}
 		return super.getAdapter(key);
 	}
@@ -305,14 +297,11 @@ public class MembersView extends JavaBrowsingPart implements IPropertyChangeList
 	@Override
 	protected void hookViewerListeners() {
 		super.hookViewerListeners();
-		getViewer().addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				TreeViewer viewer= (TreeViewer)getViewer();
-				Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
-				if (viewer.isExpandable(element))
-					viewer.setExpandedState(element, !viewer.getExpandedState(element));
-			}
+		getViewer().addDoubleClickListener(event -> {
+			TreeViewer viewer= (TreeViewer)getViewer();
+			Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
+			if (viewer.isExpandable(element))
+				viewer.setExpandedState(element, !viewer.getExpandedState(element));
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesView.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesView.java
index 99b75aca8f..5e4e4122d0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesView.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesView.java
@@ -218,12 +218,7 @@ public class PackagesView extends JavaBrowsingPart{
 	@Override
 	public <T> T getAdapter(Class<T> key) {
 		if (key == IShowInTargetList.class) {
-			return (T) new IShowInTargetList() {
-				@Override
-				public String[] getShowInTargetIds() {
-					return new String[] { JavaUI.ID_PACKAGES };
-				}
-			};
+			return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES };
 		}
 		return super.getAdapter(key);
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewFlatContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewFlatContentProvider.java
index 85ba4f3b13..25101ab35c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewFlatContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewFlatContentProvider.java
@@ -216,26 +216,20 @@ public class PackagesViewFlatContentProvider extends LogicalPackagesProvider imp
 	}
 
 	private void postAdd(final Object child) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl = fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					((TableViewer)fViewer).add(child);
-				}
+		postRunnable(() -> {
+			Control ctrl = fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				((TableViewer)fViewer).add(child);
 			}
 		});
 	}
 
 
 	private void postRemove(final Object object) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl = fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					((TableViewer)fViewer).remove(object);
-				}
+		postRunnable(() -> {
+			Control ctrl = fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				((TableViewer)fViewer).remove(object);
 			}
 		});
 	}
@@ -284,13 +278,10 @@ public class PackagesViewFlatContentProvider extends LogicalPackagesProvider imp
 			new Exception("postRefresh: " + element).printStackTrace(System.out); //$NON-NLS-1$
 		}
 
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					fViewer.refresh(element);
-				}
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				fViewer.refresh(element);
 			}
 		});
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
index 635204b196..eae1d23e43 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
@@ -499,37 +499,28 @@ class PackagesViewHierarchicalContentProvider extends LogicalPackagesProvider im
 	}
 
 	private void postAdd(final Object child, final Object parent) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl = fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					((TreeViewer)fViewer).add(parent, child);
-				}
+		postRunnable(() -> {
+			Control ctrl = fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				((TreeViewer)fViewer).add(parent, child);
 			}
 		});
 	}
 
 	private void postRemove(final Object object) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl = fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					((TreeViewer)fViewer).remove(object);
-				}
+		postRunnable(() -> {
+			Control ctrl = fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				((TreeViewer)fViewer).remove(object);
 			}
 		});
 	}
 
 	private void postRefresh(final Object object) {
-		postRunnable(new Runnable() {
-			@Override
-			public void run() {
-				Control ctrl= fViewer.getControl();
-				if (ctrl != null && !ctrl.isDisposed()) {
-					((TreeViewer) fViewer).refresh(object);
-				}
+		postRunnable(() -> {
+			Control ctrl= fViewer.getControl();
+			if (ctrl != null && !ctrl.isDisposed()) {
+				((TreeViewer) fViewer).refresh(object);
 			}
 		});
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/ProjectsView.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/ProjectsView.java
index 9497c56c46..182fc00b93 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/ProjectsView.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/ProjectsView.java
@@ -23,9 +23,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.commands.ActionHandler;
-import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -79,13 +77,7 @@ public class ProjectsView extends JavaBrowsingPart {
 	@Override
 	public <T> T getAdapter(Class<T> key) {
 		if (key == IShowInTargetList.class) {
-			return (T) new IShowInTargetList() {
-				@Override
-				public String[] getShowInTargetIds() {
-					return new String[] { JavaUI.ID_PACKAGES };
-				}
-
-			};
+			return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES };
 		}
 		return super.getAdapter(key);
 	}
@@ -118,14 +110,11 @@ public class ProjectsView extends JavaBrowsingPart {
 	@Override
 	protected void hookViewerListeners() {
 		super.hookViewerListeners();
-		getViewer().addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				TreeViewer viewer= (TreeViewer)getViewer();
-				Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
-				if (viewer.isExpandable(element))
-					viewer.setExpandedState(element, !viewer.getExpandedState(element));
-			}
+		getViewer().addDoubleClickListener(event -> {
+			TreeViewer viewer= (TreeViewer)getViewer();
+			Object element= ((IStructuredSelection)event.getSelection()).getFirstElement();
+			if (viewer.isExpandable(element))
+				viewer.setExpandedState(element, !viewer.getExpandedState(element));
 		});
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/TypesView.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/TypesView.java
index d48e3840fc..ecefe50731 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/TypesView.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/TypesView.java
@@ -67,13 +67,7 @@ public class TypesView extends JavaBrowsingPart {
 	@Override
 	public <T> T getAdapter(Class<T> key) {
 		if (key == IShowInTargetList.class) {
-			return (T) new IShowInTargetList() {
-				@Override
-				public String[] getShowInTargetIds() {
-					return new String[] { JavaUI.ID_PACKAGES};
-				}
-
-			};
+			return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES};
 		}
 		return super.getAdapter(key);
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java
index bb5caa902b..7888f7fbb9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyContentProvider.java
@@ -303,12 +303,7 @@ public class CallHierarchyContentProvider implements ITreeContentProvider {
         } catch (InterruptedException e) {
         	final CallerMethodWrapper element= (CallerMethodWrapper)methodWrapper;
         	if (!isExpandWithConstructors(element)) {
-        		Display.getDefault().asyncExec(new Runnable() {
-        			@Override
-					public void run() {
-    					collapseAndRefresh(element);
-        			}
-        		});
+        		Display.getDefault().asyncExec(() -> collapseAndRefresh(element));
         	}
         }
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
index eb47216214..da6aace741 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
@@ -45,7 +45,6 @@ import org.eclipse.swt.widgets.TreeItem;
 
 import org.eclipse.core.runtime.Assert;
 
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.action.IToolBarManager;
@@ -486,12 +485,7 @@ public class CallHierarchyViewPart extends ViewPart implements ICallHierarchyVie
         getSite().setSelectionProvider(fSelectionProviderMediator);
 
         fCallHierarchyViewer.initContextMenu(
-        		new IMenuListener() {
-		            @Override
-					public void menuAboutToShow(IMenuManager menu) {
-		                fillCallHierarchyViewerContextMenu(menu);
-		            }
-		        }, getSite(), fSelectionProviderMediator);
+        		menu -> fillCallHierarchyViewerContextMenu(menu), getSite(), fSelectionProviderMediator);
 
 
         fClipboard= new Clipboard(parent.getDisplay());
@@ -868,12 +862,7 @@ public class CallHierarchyViewPart extends ViewPart implements ICallHierarchyVie
 			return (T) JavaUIHelp.getHelpContextProvider(this, IJavaHelpContextIds.CALL_HIERARCHY_VIEW);
     	}
 		if (adapter == IShowInTargetList.class) {
-			return (T) new IShowInTargetList() {
-				@Override
-				public String[] getShowInTargetIds() {
-					return new String[] { JavaUI.ID_PACKAGES };
-				}
-			};
+			return (T) (IShowInTargetList) () -> new String[] { JavaUI.ID_PACKAGES };
 		}
     	return super.getAdapter(adapter);
     }
@@ -882,12 +871,7 @@ public class CallHierarchyViewPart extends ViewPart implements ICallHierarchyVie
 	 * @return the <code>IShowInSource</code> for this view.
 	 */
 	private IShowInSource getShowInSource() {
-		return new IShowInSource() {
-			@Override
-			public ShowInContext getShowInContext() {
-				return new ShowInContext(null, fSelectionProviderMediator.getSelection());
-			}
-		};
+		return () -> new ShowInContext(null, fSelectionProviderMediator.getSelection());
 	}
 
     /**
@@ -991,12 +975,7 @@ public class CallHierarchyViewPart extends ViewPart implements ICallHierarchyVie
         fLocationViewer= new LocationViewer(parent);
 
 
-        fLocationViewer.initContextMenu(new IMenuListener() {
-                @Override
-				public void menuAboutToShow(IMenuManager menu) {
-                    fillLocationViewerContextMenu(menu);
-                }
-            }, ID_CALL_HIERARCHY, getSite());
+        fLocationViewer.initContextMenu(menu -> fillLocationViewerContextMenu(menu), ID_CALL_HIERARCHY, getSite());
     }
 
     private void createHierarchyLocationSplitter(Composite parent) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/DeferredMethodWrapper.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/DeferredMethodWrapper.java
index 51acbb2541..486eeb84d5 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/DeferredMethodWrapper.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/DeferredMethodWrapper.java
@@ -80,14 +80,11 @@ public class DeferredMethodWrapper extends MethodWrapperWorkbenchAdapter impleme
         } catch (OperationCanceledException e) {
         	final MethodWrapper methodWrapper= deferredMethodWrapper.getMethodWrapper();
 			if (!CallHierarchyContentProvider.isExpandWithConstructors(methodWrapper)) {
-	        	Display.getDefault().asyncExec(new Runnable(){
-	        		@Override
-					public void run(){
-						CallHierarchyViewPart viewPart= fProvider.getViewPart();
-						if (viewPart != null && !viewPart.getViewer().getControl().isDisposed())
-							fProvider.collapseAndRefresh(methodWrapper);
-	        		}
-	        	});
+	        	Display.getDefault().asyncExec(() -> {
+					CallHierarchyViewPart viewPart= fProvider.getViewPart();
+					if (viewPart != null && !viewPart.getViewer().getControl().isDisposed())
+						fProvider.collapseAndRefresh(methodWrapper);
+				});
         	}
         } catch (Exception e) {
             JavaPlugin.log(e);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java
index f176ab0a14..4fdd36b608 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsDialog.java
@@ -18,15 +18,12 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import org.eclipse.core.runtime.IStatus;
-
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.TrayDialog;
 
 import org.eclipse.ui.PlatformUI;
 
 import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
 
 /**
  * Configuration dialog for default "Expand with Constructors" behavior.
@@ -65,12 +62,9 @@ class ExpandWithConstructorsDialog extends TrayDialog {
 	 */
 	@Override
 	protected Control createDialogArea(Composite composite) {
-		fConfigurationBlock= new ExpandWithConstructorsConfigurationBlock(new IStatusChangeListener() {
-			@Override
-			public void statusChanged(IStatus status) {
-				//Do nothing
+		fConfigurationBlock= new ExpandWithConstructorsConfigurationBlock(status -> {
+			//Do nothing
 
-			}
 		}, null);
 		GridData data= new GridData(GridData.FILL, GridData.FILL, true, true);
 		fConfigurationBlockControl= fConfigurationBlock.createContents(composite);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java
index 94bc95ca8a..35b995aba7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java
@@ -15,8 +15,6 @@
 package org.eclipse.jdt.internal.ui.callhierarchy;
 
 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;
@@ -89,12 +87,7 @@ class FiltersDialog extends StatusDialog {
         fMaxCallDepth = new Text(composite, SWT.SINGLE | SWT.BORDER);
         fMaxCallDepth.setFont(composite.getFont());
         fMaxCallDepth.setTextLimit(6);
-        fMaxCallDepth.addModifyListener(new ModifyListener() {
-                @Override
-				public void modifyText(ModifyEvent e) {
-                    validateInput();
-                }
-            });
+        fMaxCallDepth.addModifyListener(e -> validateInput());
 
         GridData gridData = new GridData();
         gridData.widthHint = convertWidthInCharsToPixels(10);
@@ -107,12 +100,7 @@ class FiltersDialog extends StatusDialog {
 
         fNames= new Text(parent, SWT.SINGLE | SWT.BORDER);
         fNames.setFont(parent.getFont());
-        fNames.addModifyListener(new ModifyListener() {
-                @Override
-				public void modifyText(ModifyEvent e) {
-                    validateInput();
-                }
-            });
+        fNames.addModifyListener(e -> validateInput());
 
         GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
         gridData.widthHint = convertWidthInCharsToPixels(60);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/LocationCopyAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/LocationCopyAction.java
index 318163b5e7..4619c1ee02 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/LocationCopyAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/LocationCopyAction.java
@@ -23,9 +23,7 @@ import org.eclipse.swt.dnd.Transfer;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbenchCommandConstants;
@@ -50,12 +48,7 @@ class LocationCopyAction extends Action {
 		setActionDefinitionId(IWorkbenchCommandConstants.EDIT_COPY);
 		setEnabled(!fLocationViewer.getSelection().isEmpty());
 
-		locationViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				setEnabled(! event.getSelection().isEmpty());
-			}
-		});
+		locationViewer.addSelectionChangedListener(event -> setEnabled(! event.getSelection().isEmpty()));
 	}
 
 	@Override
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/OpenLocationAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/OpenLocationAction.java
index 2df893900c..83bb1a1f3c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/OpenLocationAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/OpenLocationAction.java
@@ -18,9 +18,7 @@ import java.util.Iterator;
 
 import org.eclipse.jface.util.OpenStrategy;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 
 import org.eclipse.ui.IWorkbenchSite;
 
@@ -40,12 +38,7 @@ class OpenLocationAction extends SelectionDispatchAction {
         setToolTipText(CallHierarchyMessages.OpenLocationAction_tooltip);
 		setEnabled(!fPart.getSelection().isEmpty());
 
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				setEnabled(!event.getSelection().isEmpty());
-			}
-		});
+		viewer.addSelectionChangedListener(event -> setEnabled(!event.getSelection().isEmpty()));
 	}
 
     private boolean checkEnabled(IStructuredSelection selection) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/SearchScopeActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/SearchScopeActionGroup.java
index 5fa7ecf574..32526abcec 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/SearchScopeActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/SearchScopeActionGroup.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -183,12 +182,7 @@ class SearchScopeActionGroup extends ActionGroup {
 				IContextMenuConstants.GROUP_SEARCH);
 		javaSearchMM.setRemoveAllWhenShown(true);
 
-		javaSearchMM.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				fillSearchActions(manager);
-			}
-		});
+		javaSearchMM.addMenuListener(manager -> fillSearchActions(manager));
 
 		fillSearchActions(javaSearchMM);
 		menu.appendToGroup(IContextMenuConstants.GROUP_SEARCH, javaSearchMM);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarimport/JarImportWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarimport/JarImportWizardPage.java
index e4600327fc..71e500d981 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarimport/JarImportWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarimport/JarImportWizardPage.java
@@ -23,8 +23,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 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;
@@ -44,9 +42,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
-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.jface.wizard.WizardPage;
@@ -231,13 +227,7 @@ public final class JarImportWizardPage extends WizardPage {
 			fTreeViewer.setSelection(new StructuredSelection(new Object[] { root}), true);
 			fTreeViewer.expandToLevel(root, 1);
 		}
-		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				handleInputChanged();
-			}
-		});
+		fTreeViewer.addSelectionChangedListener(event -> handleInputChanged());
 		if (contentProvider.getChildren(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot())).length == 0) {
 			fTreeViewer.getControl().setEnabled(false);
 			label.setEnabled(false);
@@ -262,13 +252,7 @@ public final class JarImportWizardPage extends WizardPage {
 		fLocationControl= new RefactoringLocationControl(fWizard, composite, SETTING_HISTORY);
 		fLocationControl.setLayoutData(createGridData(GridData.FILL_HORIZONTAL, 1, 0));
 		fLocationControl.loadHistory();
-		fLocationControl.getControl().addModifyListener(new ModifyListener() {
-
-			@Override
-			public final void modifyText(final ModifyEvent event) {
-				handleInputChanged();
-			}
-		});
+		fLocationControl.getControl().addModifyListener(event -> handleInputChanged());
 		fLocationControl.getControl().addSelectionListener(new SelectionAdapter() {
 
 			@Override
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
index c8c8a8f788..1c7fb58602 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/CheckboxTreeAndListGroup.java
@@ -190,16 +190,13 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	public void checkStateChanged(final CheckStateChangedEvent event) {
 
 		//Potentially long operation - show a busy cursor
-		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				if (event.getCheckable().equals(fTreeViewer))
-					treeItemChecked(event.getElement(), event.getChecked());
-				else
-					listItemChecked(event.getElement(), event.getChecked(), true);
-
-				notifyCheckStateChangeListeners(event);
-			}
+		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), () -> {
+			if (event.getCheckable().equals(fTreeViewer))
+				treeItemChecked(event.getElement(), event.getChecked());
+			else
+				listItemChecked(event.getElement(), event.getChecked(), true);
+
+			notifyCheckStateChangeListeners(event);
 		});
 	}
 	/**
@@ -531,18 +528,15 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	 */
 	@Override
 	public void selectionChanged(final SelectionChangedEvent event) {
-		BusyIndicator.showWhile(getTable().getShell().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				IStructuredSelection selection= (IStructuredSelection) event.getSelection();
-				Object selectedElement= selection.getFirstElement();
-				if (selectedElement == null) {
-					fCurrentTreeSelection= null;
-					fListViewer.setInput(fCurrentTreeSelection);
-					return;
-				}
-				populateListViewer(selectedElement);
+		BusyIndicator.showWhile(getTable().getShell().getDisplay(), () -> {
+			IStructuredSelection selection= (IStructuredSelection) event.getSelection();
+			Object selectedElement= selection.getFirstElement();
+			if (selectedElement == null) {
+				fCurrentTreeSelection= null;
+				fListViewer.setInput(fCurrentTreeSelection);
+				return;
 			}
+			populateListViewer(selectedElement);
 		});
 	}
 
@@ -554,12 +548,9 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	public void setAllSelections(final boolean selection) {
 
 		//Potentially long operation - show a busy cursor
-		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				setTreeChecked(fRoot, selection);
-				fListViewer.setAllChecked(selection);
-			}
+		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), () -> {
+			setTreeChecked(fRoot, selection);
+			fListViewer.setAllChecked(selection);
 		});
 	}
 
@@ -748,12 +739,7 @@ public class CheckboxTreeAndListGroup implements ICheckStateListener, ISelection
 	public void updateSelections(final Map<Object, List<Object>> items) {
 
 		//Potentially long operation - show a busy cursor
-		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), new Runnable() {
-			@Override
-			public void run() {
-				handleUpdateSelection(items);
-			}
-		});
+		BusyIndicator.showWhile(fTreeViewer.getControl().getDisplay(), () -> handleUpdateSelection(items));
 	}
 	/**
 	 * Returns the result of running the given elements through the filters.
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarFileExportOperation.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarFileExportOperation.java
index 63a8be3177..d022e1990b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarFileExportOperation.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarFileExportOperation.java
@@ -1066,13 +1066,10 @@ public class JarFileExportOperation extends WorkspaceModifyOperation implements
 
 		if (fParentShell != null) {
 			final boolean[] res= { false };
-			fParentShell.getDisplay().syncExec(new Runnable() {
-				@Override
-				public void run() {
-					RefactoringSaveHelper refactoringSaveHelper= new RefactoringSaveHelper(RefactoringSaveHelper.SAVE_ALL_ALWAYS_ASK);
-					res[0]= refactoringSaveHelper.saveEditors(fParentShell);
-					fFilesSaved= refactoringSaveHelper.didSaveFiles();
-				}
+			fParentShell.getDisplay().syncExec(() -> {
+				RefactoringSaveHelper refactoringSaveHelper= new RefactoringSaveHelper(RefactoringSaveHelper.SAVE_ALL_ALWAYS_ASK);
+				res[0]= refactoringSaveHelper.saveEditors(fParentShell);
+				fFilesSaved= refactoringSaveHelper.didSaveFiles();
 			});
 			if (!res[0]) {
 				addError(JarPackagerMessages.JarFileExportOperation_fileUnsaved, null);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
index bc7cb289f6..d305bc5a3b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java
@@ -57,7 +57,6 @@ import org.eclipse.jface.wizard.WizardPage;
 
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 import org.eclipse.ui.dialogs.SaveAsDialog;
 import org.eclipse.ui.dialogs.SelectionDialog;
 
@@ -937,19 +936,16 @@ class JarManifestWizardPage extends WizardPage implements IJarPackageWizardPage
 		dialog.addFilter(new EmptyInnerPackageFilter());
 		dialog.addFilter(new LibraryFilter());
 		dialog.addFilter(new SealPackagesFilter(packages));
-		dialog.setValidator(new ISelectionStatusValidator() {
-			@Override
-			public IStatus validate(Object[] selection) {
-				StatusInfo res= new StatusInfo();
-				for (Object s : selection) {
-					if (!(s instanceof IPackageFragment)) {
-						res.setError(JarPackagerMessages.JarManifestWizardPage_error_mustContainPackages);
-						return res;
-					}
+		dialog.setValidator(selection -> {
+			StatusInfo res= new StatusInfo();
+			for (Object s : selection) {
+				if (!(s instanceof IPackageFragment)) {
+					res.setError(JarPackagerMessages.JarManifestWizardPage_error_mustContainPackages);
+					return res;
 				}
-				res.setOK();
-				return res;
 			}
+			res.setOK();
+			return res;
 		});
 		return dialog;
 	}
@@ -980,17 +976,14 @@ class JarManifestWizardPage extends WizardPage implements IJarPackageWizardPage
 		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), provider, new StandardJavaElementContentProvider());
 		dialog.setComparator(new JavaElementComparator());
 		dialog.setAllowMultiple(false);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			@Override
-			public IStatus validate(Object[] selection) {
-				StatusInfo res= new StatusInfo();
-				// only single selection
-				if (selection.length == 1 && (selection[0] instanceof IFile))
-					res.setOK();
-				else
-					res.setError(""); //$NON-NLS-1$
-				return res;
-			}
+		dialog.setValidator(selection -> {
+			StatusInfo res= new StatusInfo();
+			// only single selection
+			if (selection.length == 1 && (selection[0] instanceof IFile))
+				res.setOK();
+			else
+				res.setError(""); //$NON-NLS-1$
+			return res;
 		});
 		dialog.addFilter(new EmptyInnerPackageFilter());
 		dialog.addFilter(new LibraryFilter());
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java
index fbf879eb2c..b7231f7ffc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.TreeItem;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.resources.IFile;
@@ -46,8 +45,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -168,12 +165,7 @@ class JarPackageWizardPage extends AbstractJarDestinationWizardPage {
 		restoreResourceSpecificationWidgetValues(); // superclass API defines this hook
 		restoreWidgetValues();
 		if (fInitialSelection != null)
-			BusyIndicator.showWhile(parent.getDisplay(), new Runnable() {
-				@Override
-				public void run() {
-					setupBasedOnInitialSelections();
-				}
-			});
+			BusyIndicator.showWhile(parent.getDisplay(), () -> setupBasedOnInitialSelections());
 
 		setControl(composite);
 		update();
@@ -405,12 +397,7 @@ class JarPackageWizardPage extends AbstractJarDestinationWizardPage {
 		SWTUtil.setAccessibilityText(fInputGroup.getTree(), JarPackagerMessages.JarPackageWizardPage_tree_accessibility_message);
 		SWTUtil.setAccessibilityText(fInputGroup.getTable(), JarPackagerMessages.JarPackageWizardPage_table_accessibility_message);
 
-		ICheckStateListener listener = new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				update();
-			}
-		};
+		ICheckStateListener listener = event -> update();
 
 		fInputGroup.addCheckStateListener(listener);
 	}
@@ -492,13 +479,7 @@ class JarPackageWizardPage extends AbstractJarDestinationWizardPage {
 				}
 			}
 			try {
-				getContainer().run(false, true, new IRunnableWithProgress() {
-
-					@Override
-					public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						history[0]= service.getRefactoringHistory(set.toArray(new IProject[set.size()]), 0, Long.MAX_VALUE, JavaRefactoringDescriptor.JAR_MIGRATION, monitor);
-					}
-				});
+				getContainer().run(false, true, monitor -> history[0]= service.getRefactoringHistory(set.toArray(new IProject[set.size()]), 0, Long.MAX_VALUE, JavaRefactoringDescriptor.JAR_MIGRATION, monitor));
 			} catch (InvocationTargetException exception) {
 				ExceptionHandler.handle(exception, getShell(), JarPackagerMessages.JarPackageWizardPage_error_caption, JarPackagerMessages.JarPackageWizardPage_error_label);
 				return;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackagerUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackagerUtil.java
index aafb8d43ff..34384aaba6 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackagerUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackagerUtil.java
@@ -170,12 +170,7 @@ public final class JarPackagerUtil {
 		if (display == null || display.isDisposed())
 			return false;
 		final boolean[] returnValue= new boolean[1];
-		Runnable runnable= new Runnable() {
-			@Override
-			public void run() {
-				returnValue[0]= MessageDialog.openQuestion(parent, title, message);
-			}
-		};
+		Runnable runnable= () -> returnValue[0]= MessageDialog.openQuestion(parent, title, message);
 		display.syncExec(runnable);
 		return returnValue[0];
 	}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
index 47f04cb3ad..8f5091e6bc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackageWizardPage.java
@@ -32,10 +32,8 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.Assert;
@@ -465,34 +463,25 @@ public class FatJarPackageWizardPage extends AbstractJarDestinationWizardPage {
 		fExtractJarsRadioButton= new Button(fLibraryHandlingGroup, SWT.RADIO | SWT.LEFT);
 		fExtractJarsRadioButton.setText(FatJarPackagerMessages.FatJarPackageWizardPage_extractJars_text);
 		fExtractJarsRadioButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fExtractJarsRadioButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				if (((Button)event.widget).getSelection())
-					fLibraryHandler= new ExtractLibraryHandler();
-			}
+		fExtractJarsRadioButton.addListener(SWT.Selection, event -> {
+			if (((Button)event.widget).getSelection())
+				fLibraryHandler= new ExtractLibraryHandler();
 		});
 
 		fPackageJarsRadioButton= new Button(fLibraryHandlingGroup, SWT.RADIO | SWT.LEFT);
 		fPackageJarsRadioButton.setText(FatJarPackagerMessages.FatJarPackageWizardPage_packageJars_text);
 		fPackageJarsRadioButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fPackageJarsRadioButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				if (((Button)event.widget).getSelection())
-					fLibraryHandler= new PackageLibraryHandler();
-			}
+		fPackageJarsRadioButton.addListener(SWT.Selection, event -> {
+			if (((Button)event.widget).getSelection())
+				fLibraryHandler= new PackageLibraryHandler();
 		});
 
 		fCopyJarFilesRadioButton= new Button(fLibraryHandlingGroup, SWT.RADIO | SWT.LEFT);
 		fCopyJarFilesRadioButton.setText(FatJarPackagerMessages.FatJarPackageWizardPage_copyJarFiles_text);
 		fCopyJarFilesRadioButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fCopyJarFilesRadioButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				if (((Button)event.widget).getSelection())
-					fLibraryHandler= new CopyLibraryHandler();
-			}
+		fCopyJarFilesRadioButton.addListener(SWT.Selection, event -> {
+			if (((Button)event.widget).getSelection())
+				fLibraryHandler= new CopyLibraryHandler();
 		});
 
 		// set default for first selection (no previous widget settings to restore)
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackagerUtil.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackagerUtil.java
index d5c6e95c63..910c094472 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackagerUtil.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarPackagerUtil.java
@@ -54,12 +54,7 @@ public final class FatJarPackagerUtil {
 			return false;
 
 		final boolean[] returnValue= new boolean[1];
-		Runnable runnable= new Runnable() {
-			@Override
-			public void run() {
-				returnValue[0]= MessageDialog.openQuestion(parent, title, message);
-			}
-		};
+		Runnable runnable= () -> returnValue[0]= MessageDialog.openQuestion(parent, title, message);
 		display.syncExec(runnable);
 
 		return returnValue[0];
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java
index 017ab057f0..6e6246cf37 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java
@@ -19,8 +19,6 @@ import java.util.Arrays;
 import java.util.List;
 
 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;
@@ -167,12 +165,7 @@ public class JavadocSpecificsWizardPage extends JavadocWizardPage {
 			}
 		});
 
-		fOverViewText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(OVERVIEWSTATUS);
-			}
-		});
+		fOverViewText.addModifyListener(e -> doValidation(OVERVIEWSTATUS));
 
 		fOverViewBrowseButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -212,12 +205,7 @@ public class JavadocSpecificsWizardPage extends JavadocWizardPage {
 			}
 		});
 
-		fAntText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(ANTSTATUS);
-			}
-		});
+		fAntText.addModifyListener(e -> doValidation(ANTSTATUS));
 
 		fAntBrowseButton.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
index 4e4840477d..11d47c0c89 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java
@@ -23,8 +23,6 @@ import java.util.HashSet;
 import java.util.List;
 
 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,7 +36,6 @@ import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.resources.IProject;
@@ -221,12 +218,7 @@ public class JavadocStandardWizardPage extends JavadocWizardPage {
 			}
 		});
 
-		fStyleSheetText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(STYLESHEETSTATUS);
-			}
-		});
+		fStyleSheetText.addModifyListener(e -> doValidation(STYLESHEETSTATUS));
 
 		fStyleSheetBrowseButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -553,12 +545,9 @@ public class JavadocStandardWizardPage extends JavadocWizardPage {
 		@Override
 		protected void okPressed() {
 			try {
-				IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
-					@Override
-					public void run(IProgressMonitor monitor) throws CoreException {
-						URL javadocLocation= fJavadocConfigurationBlock.getJavadocLocation();
-						fElement.setURL(javadocLocation, monitor);
-					}
+				IWorkspaceRunnable runnable= monitor -> {
+					URL javadocLocation= fJavadocConfigurationBlock.getJavadocLocation();
+					fElement.setURL(javadocLocation, monitor);
 				};
 				PlatformUI.getWorkbench().getProgressService().run(true, true, new WorkbenchRunnableAdapter(runnable));
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
index c422d42d4e..31cff19f7b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java
@@ -22,8 +22,6 @@ import java.util.StringTokenizer;
 
 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.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -47,8 +45,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 
@@ -170,12 +166,7 @@ public class JavadocTreeWizardPage extends JavadocWizardPage {
 		createLabel(group, SWT.NONE, JavadocExportMessages.JavadocTreeWizardPage_javadoccommand_label, createGridData(GridData.HORIZONTAL_ALIGN_BEGINNING, numColumns, 0));
 		fJavadocCommandText= createCombo(group, SWT.NONE, null, createGridData(GridData.FILL_HORIZONTAL, numColumns - 1, 0));
 
-		fJavadocCommandText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(JAVADOCSTATUS);
-			}
-		});
+		fJavadocCommandText.addModifyListener(e -> doValidation(JAVADOCSTATUS));
 
 		final Button javadocCommandBrowserButton= createButton(group, SWT.PUSH, JavadocExportMessages.JavadocTreeWizardPage_javadoccommand_button_label, createGridData(GridData.HORIZONTAL_ALIGN_FILL, 1, 0));
 		SWTUtil.setButtonDimensionHint(javadocCommandBrowserButton);
@@ -207,12 +198,7 @@ public class JavadocTreeWizardPage extends JavadocWizardPage {
 		ITreeContentProvider listContentProvider= new JavadocMemberContentProvider();
 		fInputGroup= new CheckboxTreeAndListGroup(c, this, treeContentProvider, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT), listContentProvider, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT), SWT.NONE, convertWidthInCharsToPixels(60), convertHeightInCharsToPixels(7));
 
-		fInputGroup.addCheckStateListener(new ICheckStateListener() {
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent e) {
-				doValidation(TREESTATUS);
-			}
-		});
+		fInputGroup.addCheckStateListener(e -> doValidation(TREESTATUS));
 		fInputGroup.setTreeComparator(new JavaElementComparator());
 
 		SWTUtil.setAccessibilityText(fInputGroup.getTree(), JavadocExportMessages.JavadocTreeWizardPage_tree_accessibility_message);
@@ -323,12 +309,7 @@ public class JavadocTreeWizardPage extends JavadocWizardPage {
 				createGridData(GridData.HORIZONTAL_ALIGN_FILL, 1, LayoutUtil.getIndent()));
 		fDestinationText= createText(group, SWT.SINGLE | SWT.BORDER, null, createGridData(GridData.FILL_HORIZONTAL, numColumns - 2, 0));
 		((GridData) fDestinationText.getLayoutData()).widthHint= 0;
-		fDestinationText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(STANDARDSTATUS);
-			}
-		});
+		fDestinationText.addModifyListener(e -> doValidation(STANDARDSTATUS));
 
 		fDestinationBrowserButton= createButton(group, SWT.PUSH, JavadocExportMessages.JavadocTreeWizardPage_destinationbrowse_label, createGridData(GridData.HORIZONTAL_ALIGN_END, 1, 0));
 		SWTUtil.setButtonDimensionHint(fDestinationBrowserButton);
@@ -343,24 +324,13 @@ public class JavadocTreeWizardPage extends JavadocWizardPage {
 		((GridData) fDocletTypeText.getLayoutData()).widthHint= 0;
 
 
-		fDocletTypeText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(CUSTOMSTATUS);
-			}
-		});
+		fDocletTypeText.addModifyListener(e -> doValidation(CUSTOMSTATUS));
 
 		fDocletLabel= createLabel(group, SWT.NONE, JavadocExportMessages.JavadocTreeWizardPage_docletpathfield_label, createGridData(GridData.HORIZONTAL_ALIGN_BEGINNING, 1, LayoutUtil.getIndent()));
 		fDocletText= createText(group, SWT.SINGLE | SWT.BORDER, null, createGridData(GridData.HORIZONTAL_ALIGN_FILL, numColumns - 1, 0));
 		((GridData) fDocletText.getLayoutData()).widthHint= 0;
 
-		fDocletText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				doValidation(CUSTOMSTATUS);
-			}
-
-		});
+		fDocletText.addModifyListener(e -> doValidation(CUSTOMSTATUS));
 
 		//Add Listeners
 		fCustomButton.addSelectionListener(new EnableSelectionAdapter(new Control[] { fDocletLabel, fDocletText, fDocletTypeLabel, fDocletTypeText }, new Control[] { fDestinationLabel, fDestinationText, fDestinationBrowserButton }));
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
index 799b926dcc..5479e79734 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/model/JavaSynchronizationContentProvider.java
@@ -25,7 +25,6 @@ import org.eclipse.team.core.diff.FastDiffFilter;
 import org.eclipse.team.core.diff.IDiff;
 import org.eclipse.team.core.diff.IDiffChangeEvent;
 import org.eclipse.team.core.diff.IDiffTree;
-import org.eclipse.team.core.diff.IDiffVisitor;
 import org.eclipse.team.core.mapping.IResourceDiffTree;
 import org.eclipse.team.core.mapping.ISynchronizationContext;
 import org.eclipse.team.core.mapping.ISynchronizationScope;
@@ -220,13 +219,7 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 
 	@Override
 	public void diffsChanged(final IDiffChangeEvent event, final IProgressMonitor monitor) {
-		syncExec(new Runnable() {
-
-			@Override
-			public void run() {
-				handleChange(event);
-			}
-		}, getViewer().getControl());
+		syncExec(() -> handleChange(event), getViewer().getControl());
 	}
 
 	/**
@@ -428,17 +421,15 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 		if (!child.exists())
 			return true;
 		final boolean[] found = new boolean[] { false };
-		tree.accept(child.getFullPath(), new IDiffVisitor() {
-			@Override
-			public boolean visit(IDiff delta){
-				IResource treeResource = ResourceDiffTree.getResourceFor(delta);
-				if (treeResource.getType()==IResource.FILE && !treeResource.getParent().exists()){
-					found[0] = true;
-					return false;
-				}
+		tree.accept(child.getFullPath(), delta -> {
+			IResource treeResource = ResourceDiffTree.getResourceFor(delta);
+			if (treeResource.getType()==IResource.FILE && !treeResource.getParent().exists()){
+				found[0] = true;
+				return false;
+			}
 
-				return true;
-			}}, IResource.DEPTH_INFINITE);
+			return true;
+		}, IResource.DEPTH_INFINITE);
 		return found[0];
 	}
 
@@ -541,27 +532,23 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 				if (type == IResource.FOLDER) {
 					// If the folder contains java elements, add it
 					final IFolder folder= (IFolder) member;
-					tree.accept(folder.getFullPath(), new IDiffVisitor() {
-
-						@Override
-						public final boolean visit(final IDiff diff) {
-							if (isVisible(diff)) {
-								final IResource current= tree.getResource(diff);
-								if (current != null) {
-									final int kind= current.getType();
-									if (kind == IResource.FILE) {
-										final IJavaElement element= JavaCore.create(current.getParent());
-										if (element != null)
-											set.add(element);
-									} else {
-										final IJavaElement element= JavaCore.create(current);
-										if (element != null)
-											set.add(element);
-									}
+					tree.accept(folder.getFullPath(), diff -> {
+						if (isVisible(diff)) {
+							final IResource current= tree.getResource(diff);
+							if (current != null) {
+								final int kind= current.getType();
+								if (kind == IResource.FILE) {
+									final IJavaElement element1= JavaCore.create(current.getParent());
+									if (element1 != null)
+										set.add(element1);
+								} else {
+									final IJavaElement element2= JavaCore.create(current);
+									if (element2 != null)
+										set.add(element2);
 								}
 							}
-							return true;
 						}
+						return true;
 					}, IResource.DEPTH_INFINITE);
 				}
 			}
@@ -802,13 +789,9 @@ public final class JavaSynchronizationContentProvider extends AbstractSynchroniz
 	 */
 	private void syncExec(final Runnable runnable, final Control control) {
 		if (control != null && !control.isDisposed())
-			control.getDisplay().syncExec(new Runnable() {
-
-				@Override
-				public void run() {
-					if (!control.isDisposed())
-						BusyIndicator.showWhile(control.getDisplay(), runnable);
-				}
+			control.getDisplay().syncExec(() -> {
+				if (!control.isDisposed())
+					BusyIndicator.showWhile(control.getDisplay(), runnable);
 			});
 	}
 }