Bug 564416 - lambdas and method cleanup on org.eclipse.jdt.astview

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

1 files changed, 18 insertions, 38 deletions

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
index 308409ea24..66bd64917b 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
@@ -48,7 +48,6 @@ import org.eclipse.core.filebuffers.ITextFileBuffer;
 
 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;
@@ -836,34 +835,23 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		final TrayLabelProvider trayLabelProvider= new TrayLabelProvider();
 		fTray.setLabelProvider(trayLabelProvider);
 		fTray.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
-		fTrayUpdater= new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection viewerSelection= (IStructuredSelection) fViewer.getSelection();
-				if (viewerSelection.size() == 1) {
-					Object first= viewerSelection.getFirstElement();
-					if (unwrapAttribute(first) != null) {
-						trayLabelProvider.setViewerElement(first);
-						return;
-					}
+		fTrayUpdater= event -> {
+			IStructuredSelection viewerSelection= (IStructuredSelection) fViewer.getSelection();
+			if (viewerSelection.size() == 1) {
+				Object first= viewerSelection.getFirstElement();
+				if (unwrapAttribute(first) != null) {
+					trayLabelProvider.setViewerElement(first);
+					return;
 				}
-				trayLabelProvider.setViewerElement(null);
 			}
+			trayLabelProvider.setViewerElement(null);
 		};
 		fTray.addPostSelectionChangedListener(fTrayUpdater);
 		fViewer.addPostSelectionChangedListener(fTrayUpdater);
-		fTray.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				performTrayDoubleClick();
-			}
-		});
-		fTray.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection= (IStructuredSelection) event.getSelection();
-				fDeleteAction.setEnabled(selection.size() >= 1 && fTray.getTree().isFocusControl());
-			}
+		fTray.addDoubleClickListener(event -> performTrayDoubleClick());
+		fTray.addSelectionChangedListener(event -> {
+			IStructuredSelection selection= (IStructuredSelection) event.getSelection();
+			fDeleteAction.setEnabled(selection.size() >= 1 && fTray.getTree().isFocusControl());
 		});
 		fTray.getTree().addFocusListener(new FocusAdapter() {
 			@Override
@@ -902,12 +890,7 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 	private void hookContextMenu() {
 		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				ASTView.this.fillContextMenu(manager);
-			}
-		});
+		menuMgr.addMenuListener(manager -> fillContextMenu(manager));
 		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
 		fViewer.getControl().setMenu(menu);
 		getSite().registerContextMenu(menuMgr, fViewer);
@@ -916,14 +899,11 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 	private void hookTrayContextMenu() {
 		MenuManager menuMgr = new MenuManager("#TrayPopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager manager) {
-				manager.add(fCopyAction);
-				manager.add(fDeleteAction);
-				manager.add(new Separator());
-				manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-			}
+		menuMgr.addMenuListener(manager -> {
+			manager.add(fCopyAction);
+			manager.add(fDeleteAction);
+			manager.add(new Separator());
+			manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 		});
 		Menu menu = menuMgr.createContextMenu(fTray.getControl());
 		fTray.getControl().setMenu(menu);