Use lambdas where possibleY20200120-0020I20200120-0445I20200120-0355I20200120-0115I20200119-2330I20200119-1800I20200118-1800I20200117-1800

Using the batch cleanup operation via Source -> Cleanup -> "Use lambdas
where possible" from standard JDT.

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

15 files changed, 67 insertions, 200 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
index 7ef3e03c31f..376c789f3a9 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/EncodingActionGroup.java
@@ -24,7 +24,6 @@ import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.resources.IFile;
 
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
@@ -265,12 +264,7 @@ public class EncodingActionGroup extends ActionGroup {
 
 			String title= TextEditorMessages.Editor_ConvertEncoding_Custom_dialog_title;
 			String message= TextEditorMessages.Editor_ConvertEncoding_Custom_dialog_message;
-			IInputValidator inputValidator = new IInputValidator() {
-				@Override
-				public String isValid(String newText) {
-					return (newText == null || newText.isEmpty()) ? " " : null; //$NON-NLS-1$
-				}
-			};
+			IInputValidator inputValidator = newText -> (newText == null || newText.isEmpty()) ? " " : null;
 
 			String initialValue= encodingSupport.getEncoding();
 			if (initialValue == null)
@@ -356,12 +350,7 @@ public class EncodingActionGroup extends ActionGroup {
 		IMenuManager editMenu= menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
 		if (editMenu != null && !fRetargetActions.isEmpty()) {
 			MenuManager subMenu= new MenuManager(TextEditorMessages.Editor_ConvertEncoding_submenu_label);
-			subMenu.addMenuListener(new IMenuListener() {
-				@Override
-				public void menuAboutToShow(IMenuManager manager) {
-					update();
-				}
-			});
+			subMenu.addMenuListener(manager -> update());
 
 			Iterator<RetargetTextEditorAction> e= fRetargetActions.iterator();
 			subMenu.add(e.next());
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java
index 3c752f03644..658044fbf37 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextSourceViewerConfiguration.java
@@ -21,7 +21,6 @@ import java.util.StringTokenizer;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
@@ -31,7 +30,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 
 import org.eclipse.jface.text.DefaultInformationControl;
 import org.eclipse.jface.text.DefaultTextHover;
-import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.ITextHoverExtension;
@@ -390,12 +388,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration {
 	 * @since 3.3
 	 */
 	private IInformationControlCreator getQuickAssistAssistantInformationControlCreator() {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new DefaultInformationControl(parent, EditorsPlugin.getAdditionalInfoAffordanceString());
-			}
-		};
+		return parent -> new DefaultInformationControl(parent, EditorsPlugin.getAdditionalInfoAffordanceString());
 	}
 
 	/**
@@ -441,12 +434,7 @@ public class TextSourceViewerConfiguration extends SourceViewerConfiguration {
 
 		@Override
 		public IInformationControlCreator getHoverControlCreator() {
-			return new IInformationControlCreator() {
-				@Override
-				public IInformationControl createInformationControl(Shell parent) {
-					return new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString());
-				}
-			};
+			return parent -> new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString());
 		}
 	}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
index 1d99fd2b1e3..63dbd47d896 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/ConvertLineDelimitersAction.java
@@ -90,12 +90,7 @@ public class ConvertLineDelimitersAction extends FileBufferOperationAction {
 			return filterUnacceptableFiles(files);
 		}
 
-		final IFilter filter= new IFilter() {
-			@Override
-			public boolean accept(IResource resource) {
-				return resource != null && isAcceptableLocation(resource.getFullPath());
-			}
-		};
+		final IFilter filter= resource -> resource != null && isAcceptableLocation(resource.getFullPath());
 
 		SelectResourcesDialog dialog= new SelectResourcesDialog(getShell(), getDialogTitle(), TextEditorMessages.ConvertLineDelimitersAction_dialog_description, filter) {
 			@Override
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java
index 5cf2119d4e6..c3e48f543e0 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java
@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.Status;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 
 import org.eclipse.jface.text.source.ISharedTextColors;
 
@@ -205,12 +204,9 @@ public class EditorsPlugin extends AbstractUIPlugin {
 		super.start(context);
 
 		if (PlatformUI.isWorkbenchRunning()) {
-			fThemeListener= new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty()))
-						EditorsPluginPreferenceInitializer.setThemeBasedPreferences(getPreferenceStore(), true);
-				}
+			fThemeListener= event -> {
+				if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty()))
+					EditorsPluginPreferenceInitializer.setThemeBasedPreferences(getPreferenceStore(), true);
 			};
 			PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(fThemeListener);
 		}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
index 1962c0cbd14..99b279ad39b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/RemoveTrailingWhitespaceHandler.java
@@ -65,12 +65,7 @@ public class RemoveTrailingWhitespaceHandler extends FileBufferOperationHandler
 		if (containsOnlyFiles(resources))
 			return files;
 
-		final IFilter filter= new IFilter() {
-			@Override
-			public boolean accept(IResource resource) {
-				return resource != null && isAcceptableLocation(resource.getFullPath());
-			}
-		};
+		final IFilter filter= resource -> resource != null && isAcceptableLocation(resource.getFullPath());
 
 		SelectResourcesDialog dialog= new SelectResourcesDialog(getShell(), TextEditorMessages.RemoveTrailingWhitespaceHandler_dialog_title, TextEditorMessages.RemoveTrailingWhitespaceHandler_dialog_description, filter);
 		dialog.setInput(resources);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java
index ba70bcc94d5..7de33bf4cb5 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/AnnotationColumn.java
@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.Assert;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationRulerColumn;
@@ -128,19 +127,16 @@ public class AnnotationColumn extends AbstractContributedRulerColumn implements
 			column.addAnnotationType(Annotation.TYPE_UNKNOWN);
 
 			// link to preference store
-			fPropertyListener= new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					String property= event.getProperty();
-					AnnotationPreference annotationPreference= getVerticalRulerAnnotationPreference(property);
-					if (annotationPreference != null && property.equals(annotationPreference.getVerticalRulerPreferenceKey())) {
-						Object type= annotationPreference.getAnnotationType();
-						if (getPreferenceStore().getBoolean(property))
-							column.addAnnotationType(type);
-						else
-							column.removeAnnotationType(type);
-						column.redraw();
-					}
+			fPropertyListener= event -> {
+				String property= event.getProperty();
+				AnnotationPreference annotationPreference= getVerticalRulerAnnotationPreference(property);
+				if (annotationPreference != null && property.equals(annotationPreference.getVerticalRulerPreferenceKey())) {
+					Object type= annotationPreference.getAnnotationType();
+					if (getPreferenceStore().getBoolean(property))
+						column.addAnnotationType(type);
+					else
+						column.removeAnnotationType(type);
+					column.redraw();
 				}
 			};
 			store.addPropertyChangeListener(fPropertyListener);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
index 0f2b24c8e54..74afbe2a0fd 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java
@@ -29,7 +29,6 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.window.Window;
 
@@ -241,91 +240,45 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements
 		// listen to changes
 		fDispatcher= new PropertyEventDispatcher(store);
 
-		fDispatcher.addPropertyChangeListener(FG_COLOR_KEY, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateForegroundColor(store, fDelegate);
-				fDelegate.redraw();
-			}
+		fDispatcher.addPropertyChangeListener(FG_COLOR_KEY, event -> {
+			updateForegroundColor(store, fDelegate);
+			fDelegate.redraw();
 		});
-		IPropertyChangeListener backgroundHandler= new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateBackgroundColor(store, fDelegate);
-				fDelegate.redraw();
-			}
+		IPropertyChangeListener backgroundHandler= event -> {
+			updateBackgroundColor(store, fDelegate);
+			fDelegate.redraw();
 		};
 		fDispatcher.addPropertyChangeListener(BG_COLOR_KEY, backgroundHandler);
 		fDispatcher.addPropertyChangeListener(USE_DEFAULT_BG_KEY, backgroundHandler);
 
-		fDispatcher.addPropertyChangeListener(LINE_NUMBER_KEY, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				// only handle quick diff on/off information, but not ruler visibility (handled by AbstractDecoratedTextEditor)
-				updateLineNumbersVisibility(fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(LINE_NUMBER_KEY, event -> updateLineNumbersVisibility(fDelegate));
 
-		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_CHARACTER_MODE, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateCharacterMode(store, fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_CHARACTER_MODE, event -> updateCharacterMode(store, fDelegate));
 
-		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateRevisionRenderingMode(store, fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_RENDERING_MODE, event -> updateRevisionRenderingMode(store, fDelegate));
 
-		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_AUTHOR, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateRevisionAuthorVisibility(store, fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_AUTHOR, event -> updateRevisionAuthorVisibility(store, fDelegate));
 
-		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_REVISION, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateRevisionIdVisibility(store, fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.REVISION_RULER_SHOW_REVISION, event -> updateRevisionIdVisibility(store, fDelegate));
 
-		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent event) {
-				updateQuickDiffVisibility(fDelegate);
-			}
-		});
+		fDispatcher.addPropertyChangeListener(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON, event -> updateQuickDiffVisibility(fDelegate));
 
 		if (changedPref != null) {
-			fDispatcher.addPropertyChangeListener(changedPref.getColorPreferenceKey(), new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					updateChangedColor(changedPref, store, fDelegate);
-					fDelegate.redraw();
-				}
+			fDispatcher.addPropertyChangeListener(changedPref.getColorPreferenceKey(), event -> {
+				updateChangedColor(changedPref, store, fDelegate);
+				fDelegate.redraw();
 			});
 		}
 		if (addedPref != null) {
-			fDispatcher.addPropertyChangeListener(addedPref.getColorPreferenceKey(), new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					updateAddedColor(addedPref, store, fDelegate);
-					fDelegate.redraw();
-				}
+			fDispatcher.addPropertyChangeListener(addedPref.getColorPreferenceKey(), event -> {
+				updateAddedColor(addedPref, store, fDelegate);
+				fDelegate.redraw();
 			});
 		}
 		if (deletedPref != null) {
-			fDispatcher.addPropertyChangeListener(deletedPref.getColorPreferenceKey(), new IPropertyChangeListener() {
-				@Override
-				public void propertyChange(PropertyChangeEvent event) {
-					updateDeletedColor(deletedPref, store, fDelegate);
-					fDelegate.redraw();
-				}
+			fDispatcher.addPropertyChangeListener(deletedPref.getColorPreferenceKey(), event -> {
+				updateDeletedColor(deletedPref, store, fDelegate);
+				fDelegate.redraw();
 			});
 		}
 	}
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java
index 856a0eceb3a..d096f2d6992 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/PropertyEventDispatcher.java
@@ -28,12 +28,7 @@ public final class PropertyEventDispatcher {
 	private final Map<Object, Object> fHandlerMap= new HashMap<>();
 	private final Map<Object, Object> fReverseMap= new HashMap<>();
 	private final IPreferenceStore fStore;
-	private final IPropertyChangeListener fListener= new IPropertyChangeListener() {
-		@Override
-		public void propertyChange(PropertyChangeEvent event) {
-			firePropertyChange(event);
-		}
-	};
+	private final IPropertyChangeListener fListener= event -> firePropertyChange(event);
 	public PropertyEventDispatcher(IPreferenceStore store) {
 		Assert.isLegal(store != null);
 		fStore= store;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
index 645b72b2ec7..521ba4e01dc 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
@@ -449,12 +449,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 
 	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new SourceViewerInformationControl(parent, true, fSymbolicFontName, null);
-			}
-		};
+		return parent -> new SourceViewerInformationControl(parent, true, fSymbolicFontName, null);
 	}
 
 	@Override
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java
index 12d4c845946..0c314ccc284 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/TextChangeHover.java
@@ -13,11 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.texteditor;
 
-import org.eclipse.swt.widgets.Shell;
-
 import org.eclipse.jface.resource.JFaceResources;
 
-import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.source.ILineRange;
 import org.eclipse.jface.text.source.ISourceViewer;
@@ -50,24 +47,16 @@ public class TextChangeHover extends LineChangeHover {
 
 	@Override
 	public IInformationControlCreator getHoverControlCreator() {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				SourceViewerInformationControl control= new SourceViewerInformationControl(parent, false, JFaceResources.TEXT_FONT, EditorsUI.getTooltipAffordanceString());
-				control.setHorizontalScrollPixel(fLastScrollIndex);
-				return control;
-			}
+		return parent -> {
+			SourceViewerInformationControl control= new SourceViewerInformationControl(parent, false, JFaceResources.TEXT_FONT, EditorsUI.getTooltipAffordanceString());
+			control.setHorizontalScrollPixel(fLastScrollIndex);
+			return control;
 		};
 	}
 
 	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
-		return new IInformationControlCreator() {
-			@Override
-			public IInformationControl createInformationControl(Shell parent) {
-				return new SourceViewerInformationControl(parent, true, JFaceResources.TEXT_FONT, null);
-			}
-		};
+		return parent -> new SourceViewerInformationControl(parent, true, JFaceResources.TEXT_FONT, null);
 	}
 
 }
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
index 2e8b1e69476..7ecc2afba9b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
@@ -510,16 +510,13 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 	@Override
 	protected IMenuListener createContextMenuListener() {
 		final IMenuListener superListener= super.createContextMenuListener();
-		return new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager menu) {
-				if (!getOverviewRulerContextMenuId().equals(menu.getId())) {
-					superListener.menuAboutToShow(menu);
-					return;
-				}
-				setFocus();
-				overviewRulerContextMenuAboutToShow(menu);
+		return menu -> {
+			if (!getOverviewRulerContextMenuId().equals(menu.getId())) {
+				superListener.menuAboutToShow(menu);
+				return;
 			}
+			setFocus();
+			overviewRulerContextMenuAboutToShow(menu);
 		};
 	}
 
@@ -1409,15 +1406,12 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 			return (T) getAnnotationAccess();
 
 		if (adapter == IShowInSource.class) {
-			return (T) new IShowInSource() {
-				@Override
-				public ShowInContext getShowInContext() {
-					ISelection selection= null;
-					ISelectionProvider selectionProvider= getSelectionProvider();
-					if (selectionProvider != null)
-						selection= selectionProvider.getSelection();
-					return new ShowInContext(getEditorInput(), selection);
-				}
+			return (T) (IShowInSource) () -> {
+				ISelection selection= null;
+				ISelectionProvider selectionProvider= getSelectionProvider();
+				if (selectionProvider != null)
+					selection= selectionProvider.getSelection();
+				return new ShowInContext(getEditorInput(), selection);
 			};
 		}
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java
index 2161baf3f73..b5713bedc67 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AddMarkerAction.java
@@ -179,12 +179,7 @@ public class AddMarkerAction extends TextEditorAction {
 		String proposal= (o instanceof String) ? (String) o : ""; //$NON-NLS-1$
 		String title= getString(fBundle, fPrefix + "dialog.title", fPrefix + "dialog.title"); //$NON-NLS-2$ //$NON-NLS-1$
 		String message= getString(fBundle, fPrefix + "dialog.message", fPrefix + "dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$
-		IInputValidator inputValidator= new IInputValidator() {
-			@Override
-			public String isValid(String newText) {
-				return  (newText == null || newText.trim().isEmpty()) ? " " : null;  //$NON-NLS-1$
-			}
-		};
+		IInputValidator inputValidator= newText -> (newText == null || newText.trim().isEmpty()) ? " " : null;
 		InputDialog dialog= new InputDialog(getTextEditor().getSite().getShell(), title, message, proposal, inputValidator);
 
 		String label= null;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
index cee66714461..df4adce01bb 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
@@ -406,12 +406,7 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate {
 		String title= getString(fBundle, fPrefix + "add.dialog.title", fPrefix + "add.dialog.title"); //$NON-NLS-2$ //$NON-NLS-1$
 		String message= getString(fBundle, fPrefix + "add.dialog.message", fPrefix + "add.dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$
 		String addButtonText= getString(fBundle, fPrefix + "add.dialog.addbutton", fPrefix + "add.dialog.addbutton"); //$NON-NLS-1$ //$NON-NLS-2$
-		IInputValidator inputValidator= new IInputValidator() {
-			@Override
-			public String isValid(String newText) {
-				return (newText == null || newText.trim().isEmpty()) ? " " : null; //$NON-NLS-1$
-			}
-		};
+		IInputValidator inputValidator= newText -> (newText == null || newText.trim().isEmpty()) ? " " : null;
 		AddBookmarkDialog dialog= new AddBookmarkDialog(fTextEditor.getSite().getShell(), title, message, proposal, inputValidator, addButtonText);
 
 		String label= null;
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
index ed5f3a96daa..e23343c57fe 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 
 import org.eclipse.core.resources.IMarker;
@@ -382,12 +381,9 @@ public final class MarkerUtilities {
 	 */
 	public static void createMarker(final IResource resource, final Map<String, Object> attributes, final String markerType) throws CoreException {
 
-		IWorkspaceRunnable r= new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IMarker marker= resource.createMarker(markerType);
-				marker.setAttributes(attributes);
-			}
+		IWorkspaceRunnable r= monitor -> {
+			IMarker marker= resource.createMarker(markerType);
+			marker.setAttributes(attributes);
 		};
 
 		resource.getWorkspace().run(r, null,IWorkspace.AVOID_UPDATE, null);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
index b97ada48f61..6db4b6824d5 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ResourceMarkerAnnotationModel.java
@@ -18,7 +18,6 @@ import java.util.Iterator;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IMarkerDelta;
@@ -179,12 +178,9 @@ public class ResourceMarkerAnnotationModel extends AbstractMarkerAnnotationModel
 
 	@Override
 	protected void deleteMarkers(final IMarker[] markers) throws CoreException {
-		fWorkspace.run(new IWorkspaceRunnable() {
-			@Override
-			public void run(IProgressMonitor monitor) throws CoreException {
-				for (IMarker marker : markers) {
-					marker.delete();
-				}
+		fWorkspace.run((IWorkspaceRunnable) monitor -> {
+			for (IMarker marker : markers) {
+				marker.delete();
 			}
 		}, null, IWorkspace.AVOID_UPDATE, null);
 	}