Bug 564416 - lambdas and method cleanup on org.eclipse.jdt.jeviewI20200713-1800I20200712-1800I20200711-2250I20200711-1800

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

2 files changed, 28 insertions, 101 deletions

diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
index bd4b046be1..729311dfe4 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElement.java
@@ -204,18 +204,8 @@ public class JavaElement extends JEAttribute {
 		result.add(new JavaElement(this, "JAVA MODEL", javaElement.getJavaModel()));
 		result.add(new JavaElement(this, "JAVA PROJECT", javaElement.getJavaProject()));
 		result.add(JEResource.create(this, "RESOURCE", javaElement.getResource()));
-		result.add(JEResource.compute(this, "CORRESPONDING RESOURCE", new Callable<IResource>() {
-			@Override
-			public IResource call() throws JavaModelException {
-				return javaElement.getCorrespondingResource();
-			}
-		}));
-		result.add(JEResource.compute(this, "UNDERLYING RESOURCE", new Callable<IResource>() {
-			@Override
-			public IResource call() throws JavaModelException {
-				return javaElement.getUnderlyingResource();
-			}
-		}));
+		result.add(JEResource.compute(this, "CORRESPONDING RESOURCE", () -> javaElement.getCorrespondingResource()));
+		result.add(JEResource.compute(this, "UNDERLYING RESOURCE", () -> javaElement.getUnderlyingResource()));
 	}
 
 	private void addJavaModelChildren(ArrayList<JEAttribute> result, final IJavaModel javaModel) {
@@ -304,18 +294,8 @@ public class JavaElement extends JEAttribute {
 				return createResources(this, packageFragmentRoot.getNonJavaResources());
 			}
 		});
-		result.add(JEClasspathEntry.compute(this, "RAW CLASSPATH ENTRY", new Callable<IClasspathEntry>() {
-			@Override
-			public IClasspathEntry call() throws JavaModelException {
-				return packageFragmentRoot.getRawClasspathEntry();
-			}
-		}));
-		result.add(JEClasspathEntry.compute(this, "RESOLVED CLASSPATH ENTRY", new Callable<IClasspathEntry>() {
-			@Override
-			public IClasspathEntry call() throws JavaModelException {
-				return packageFragmentRoot.getResolvedClasspathEntry();
-			}
-		}));
+		result.add(JEClasspathEntry.compute(this, "RAW CLASSPATH ENTRY", () -> packageFragmentRoot.getRawClasspathEntry()));
+		result.add(JEClasspathEntry.compute(this, "RESOLVED CLASSPATH ENTRY", () -> packageFragmentRoot.getResolvedClasspathEntry()));
 	}
 
 	private void addPackageFragmentChildren(ArrayList<JEAttribute> result, final IPackageFragment packageFragment) {
@@ -340,30 +320,15 @@ public class JavaElement extends JEAttribute {
 	}
 
 	private void addTypeRootChildren(ArrayList<JEAttribute> result, final ITypeRoot typeRoot) {
-		result.add(JavaElement.compute(this, "FIND PRIMARY TYPE", new Callable<IJavaElement>() {
-			@Override
-			public IJavaElement call() {
-				return typeRoot.findPrimaryType();
-			}
-		}));
+		result.add(JavaElement.compute(this, "FIND PRIMARY TYPE", () -> typeRoot.findPrimaryType()));
 	}
 
 	private void addClassFileChildren(ArrayList<JEAttribute> result, final IOrdinaryClassFile classFile) {
-		result.add(JavaElement.compute(this, "TYPE", new Callable<IJavaElement>() {
-			@Override
-			public IJavaElement call() throws JavaModelException {
-				return classFile.getType();
-			}
-		}));
+		result.add(JavaElement.compute(this, "TYPE", () -> classFile.getType()));
 	}
 
 	private void addModularClassFileChildren(ArrayList<JEAttribute> result, final IModularClassFile classFile) {
-		result.add(JavaElement.compute(this, "MODULE", new Callable<IJavaElement>() {
-			@Override
-			public IJavaElement call() throws JavaModelException {
-				return classFile.getModule();
-			}
-		}));
+		result.add(JavaElement.compute(this, "MODULE", () -> classFile.getModule()));
 	}
 
 	private void addCompilationUnitChildren(ArrayList<JEAttribute> result, final ICompilationUnit compilationUnit) {
@@ -614,12 +579,7 @@ public class JavaElement extends JEAttribute {
 
 	static JEAttribute[] createOptions(JEAttribute parent, Map<String, String> options) {
 		ArrayList<Entry<String, String>> entries= new ArrayList<>(options.entrySet());
-		Collections.sort(entries, new Comparator<Entry<String, String>>() {
-			@Override
-			public int compare(Entry<String, String> o1, Entry<String, String> o2) {
-				return o1.getKey().compareTo(o2.getKey());
-			}
-		});
+		Collections.sort(entries, Comparator.comparing(Entry<String, String>::getKey));
 
 		JEAttribute[] children= new JEAttribute[entries.size()];
 		for (int i= 0; i < entries.size(); i++) {
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
index 6fac75a96f..7f83c566b9 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/JavaElementView.java
@@ -60,7 +60,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 
 import org.eclipse.jface.action.Action;
 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;
@@ -70,8 +69,6 @@ import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -111,8 +108,6 @@ import org.eclipse.ui.part.IShowInTarget;
 import org.eclipse.ui.part.ShowInContext;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
 import org.eclipse.ui.views.properties.PropertySheetPage;
 
 import org.eclipse.ui.texteditor.ITextEditor;
@@ -182,12 +177,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 
 		public JEViewSelectionProvider(TreeViewer viewer) {
 			fViewer= viewer;
-			fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-				@Override
-				public void selectionChanged(SelectionChangedEvent event) {
-					fireSelectionChanged();
-				}
-			});
+			fViewer.addSelectionChangedListener(event -> fireSelectionChanged());
 		}
 
 		void fireSelectionChanged() {
@@ -290,12 +280,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 		hookContextMenu();
 		hookDoubleClickAction();
 		getSite().setSelectionProvider(new JEViewSelectionProvider(fViewer));
-		fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				fCopyAction.setEnabled(! event.getSelection().isEmpty());
-			}
-		});
+		fViewer.addSelectionChangedListener(event -> fCopyAction.setEnabled(! event.getSelection().isEmpty()));
 		contributeToActionBars();
 	}
 
@@ -332,12 +317,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 	private void hookContextMenu() {
 		MenuManager menuMgr = new MenuManager("#PopupMenu");
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				JavaElementView.this.fillContextMenu(manager);
-			}
-		});
+		menuMgr.addMenuListener(manager -> fillContextMenu(manager));
 		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
 		fViewer.getControl().setMenu(menu);
 		getSite().registerContextMenu(menuMgr, fViewer);
@@ -725,12 +705,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 
 		fRefreshAction= new Action("Re&fresh", JEPluginImages.IMG_REFRESH) {
 			@Override public void run() {
-				BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-					@Override
-					public void run() {
-						fViewer.refresh();
-					}
-				});
+				BusyIndicator.showWhile(getSite().getShell().getDisplay(), () -> fViewer.refresh());
 			}
 		};
 		fRefreshAction.setToolTipText("Refresh");
@@ -935,12 +910,7 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 	}
 
 	private void hookDoubleClickAction() {
-		fViewer.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				fDoubleClickAction.run();
-			}
-		});
+		fViewer.addDoubleClickListener(event -> fDoubleClickAction.run());
 	}
 
 	void showAndLogError(String message, CoreException e) {
@@ -1042,24 +1012,21 @@ public class JavaElementView extends ViewPart implements IShowInSource, IShowInT
 	private PropertySheetPage getPropertySheetPage() {
 		if (fPropertySheetPage == null) {
 			final PropertySheetPage propertySheetPage= new PropertySheetPage();
-			propertySheetPage.setPropertySourceProvider(new IPropertySourceProvider() {
-				@Override
-				public IPropertySource getPropertySource(Object object) {
-					if (object instanceof IJavaElement)
-						return new JavaElementProperties((IJavaElement) object);
-					else if (object instanceof IResource)
-						return new ResourceProperties((IResource) object);
-					else if (object instanceof IMarker)
-						return new MarkerProperties((IMarker) object);
-					else if (object instanceof IJarEntryResource)
-						return new JarEntryResourceProperties((IJarEntryResource) object);
-					else if (object instanceof IMemberValuePair)
-						return new MemberValuePairProperties((IMemberValuePair) object);
-					else if (object instanceof IClasspathEntry)
-						return new ClasspathEntryProperties((IClasspathEntry) object);
-					else
-						return null;
-				}
+			propertySheetPage.setPropertySourceProvider(object -> {
+				if (object instanceof IJavaElement)
+					return new JavaElementProperties((IJavaElement) object);
+				else if (object instanceof IResource)
+					return new ResourceProperties((IResource) object);
+				else if (object instanceof IMarker)
+					return new MarkerProperties((IMarker) object);
+				else if (object instanceof IJarEntryResource)
+					return new JarEntryResourceProperties((IJarEntryResource) object);
+				else if (object instanceof IMemberValuePair)
+					return new MemberValuePairProperties((IMemberValuePair) object);
+				else if (object instanceof IClasspathEntry)
+					return new ClasspathEntryProperties((IClasspathEntry) object);
+				else
+					return null;
 			});
 			fPropertySheetPage= propertySheetPage;
 		}