Lambda and method cleanup on platform.ui plug-ins

Running the JDT batch cleanup for lambdas and method reference showed
still some places where they can be used. As we received lots of
cleanups in this area, I think it is good to finish this.

Change-Id: I27735829b7a857b0a908dd31ce2fa29dc2e266c5
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Also-by: Karsten Thoms <karsten.thoms@karakun.com>

12 files changed, 209 insertions, 286 deletions

diff --git a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/AboutText.java b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/AboutText.java
index 2dab0a84dcf..318b02759cb 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/AboutText.java
+++ b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/internal/dialogs/about/AboutText.java
@@ -27,8 +27,6 @@ import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;

 import org.eclipse.swt.events.MouseAdapter;

 import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.TraverseEvent;

-import org.eclipse.swt.events.TraverseListener;

 import org.eclipse.swt.graphics.Color;

 import org.eclipse.swt.graphics.Cursor;

 import org.eclipse.swt.graphics.Point;

@@ -147,53 +145,50 @@ public class AboutText {
 			}

 		});

 

-		styledText.addTraverseListener(new TraverseListener() {

-			@Override

-			public void keyTraversed(TraverseEvent e) {

-				switch (e.detail) {

-				case SWT.TRAVERSE_ESCAPE:

-					e.doit = true;

-					break;

-				case SWT.TRAVERSE_TAB_NEXT:

-					// Previously traverse out in the backward direction?

-					Point nextSelection = styledText.getSelection();

-					int charCount = styledText.getCharCount();

-					if ((nextSelection.x == charCount) && (nextSelection.y == charCount)) {

-						styledText.setSelection(0);

-					}

-					StyleRange nextRange = findNextRange();

-					if (nextRange == null) {

-						// Next time in start at beginning, also used by

-						// TRAVERSE_TAB_PREVIOUS to indicate we traversed out

-						// in the forward direction

-						styledText.setSelection(0);

-					} else {

-						styledText.setSelectionRange(nextRange.start, nextRange.length);

-						e.detail = SWT.TRAVERSE_NONE;

-					}

-					e.doit = true;

-					break;

-				case SWT.TRAVERSE_TAB_PREVIOUS:

-					// Previously traverse out in the forward direction?

-					Point previousSelection = styledText.getSelection();

-					if ((previousSelection.x == 0) && (previousSelection.y == 0)) {

-						styledText.setSelection(styledText.getCharCount());

-					}

-					StyleRange previousRange = findPreviousRange();

-					if (previousRange == null) {

-						// Next time in start at the end, also used by

-						// TRAVERSE_TAB_NEXT to indicate we traversed out

-						// in the backward direction

-						styledText.setSelection(styledText.getCharCount());

-					} else {

-						styledText.setSelectionRange(previousRange.start, previousRange.length);

-						e.detail = SWT.TRAVERSE_NONE;

-					}

-					e.doit = true;

-					break;

-				default:

-					break;

+		styledText.addTraverseListener(e -> {

+			switch (e.detail) {

+			case SWT.TRAVERSE_ESCAPE:

+				e.doit = true;

+				break;

+			case SWT.TRAVERSE_TAB_NEXT:

+				// Previously traverse out in the backward direction?

+				Point nextSelection = styledText.getSelection();

+				int charCount = styledText.getCharCount();

+				if ((nextSelection.x == charCount) && (nextSelection.y == charCount)) {

+					styledText.setSelection(0);

+				}

+				StyleRange nextRange = findNextRange();

+				if (nextRange == null) {

+					// Next time in start at beginning, also used by

+					// TRAVERSE_TAB_PREVIOUS to indicate we traversed out

+					// in the forward direction

+					styledText.setSelection(0);

+				} else {

+					styledText.setSelectionRange(nextRange.start, nextRange.length);

+					e.detail = SWT.TRAVERSE_NONE;

+				}

+				e.doit = true;

+				break;

+			case SWT.TRAVERSE_TAB_PREVIOUS:

+				// Previously traverse out in the forward direction?

+				Point previousSelection = styledText.getSelection();

+				if ((previousSelection.x == 0) && (previousSelection.y == 0)) {

+					styledText.setSelection(styledText.getCharCount());

+				}

+				StyleRange previousRange = findPreviousRange();

+				if (previousRange == null) {

+					// Next time in start at the end, also used by

+					// TRAVERSE_TAB_NEXT to indicate we traversed out

+					// in the backward direction

+					styledText.setSelection(styledText.getCharCount());

+				} else {

+					styledText.setSelectionRange(previousRange.start, previousRange.length);

+					e.detail = SWT.TRAVERSE_NONE;

 				}

+				e.doit = true;

+				break;

+			default:

+				break;

 			}

 		});

 

diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
index 9fe65d26a40..6ef89d1cd75 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
@@ -74,44 +74,41 @@ public class PartServiceImpl implements EPartService {
 	 */
 	public static final String PART_ACTIVATION_TIME = "partActivationTime"; //$NON-NLS-1$
 
-	private EventHandler selectedHandler = new EventHandler() {
-		@Override
-		public void handleEvent(Event event) {
-			// no need to do anything if we have no listeners
-			if (!listeners.isEmpty()) {
-				Object oldSelected = event.getProperty(UIEvents.EventTags.OLD_VALUE);
-				if (oldSelected instanceof MPlaceholder) {
-					oldSelected = ((MPlaceholder) oldSelected).getRef();
-				}
+	private EventHandler selectedHandler = event -> {
+		// no need to do anything if we have no listeners
+		if (!this.listeners.isEmpty()) {
+			Object oldSelected = event.getProperty(UIEvents.EventTags.OLD_VALUE);
+			if (oldSelected instanceof MPlaceholder) {
+				oldSelected = ((MPlaceholder) oldSelected).getRef();
+			}
 
-				MPlaceholder placeholder = null;
-				Object selected = event.getProperty(UIEvents.EventTags.NEW_VALUE);
-				if (selected instanceof MPlaceholder) {
-					placeholder = (MPlaceholder) selected;
-					selected = placeholder.getRef();
-				}
+			MPlaceholder placeholder = null;
+			Object selected = event.getProperty(UIEvents.EventTags.NEW_VALUE);
+			if (selected instanceof MPlaceholder) {
+				placeholder = (MPlaceholder) selected;
+				selected = placeholder.getRef();
+			}
 
-				MPart oldSelectedPart = oldSelected instanceof MPart ? (MPart) oldSelected : null;
-				MPart selectedPart = selected instanceof MPart ? (MPart) selected : null;
+			MPart oldSelectedPart = oldSelected instanceof MPart ? (MPart) oldSelected : null;
+			MPart selectedPart = selected instanceof MPart ? (MPart) selected : null;
 
-				if (oldSelectedPart != null && getParts().contains(selectedPart)) {
-					firePartHidden(oldSelectedPart);
-				}
+			if (oldSelectedPart != null && getParts().contains(selectedPart)) {
+				firePartHidden(oldSelectedPart);
+			}
 
-				if (selectedPart != null && selectedPart.isToBeRendered()
-						&& getParts().contains(selectedPart)) {
-					// ask the renderer to create this part
-					if (placeholder == null) {
-						if (selectedPart.getParent().getRenderer() != null) {
-							engine.createGui(selectedPart);
-							firePartVisible(selectedPart);
-							firePartBroughtToTop(selectedPart);
-						}
-					} else if (placeholder.getParent().getRenderer() != null) {
-						engine.createGui(placeholder);
+			if (selectedPart != null && selectedPart.isToBeRendered()
+					&& getParts().contains(selectedPart)) {
+				// ask the renderer to create this part
+				if (placeholder == null) {
+					if (selectedPart.getParent().getRenderer() != null) {
+						this.engine.createGui(selectedPart);
 						firePartVisible(selectedPart);
 						firePartBroughtToTop(selectedPart);
 					}
+				} else if (placeholder.getParent().getRenderer() != null) {
+					this.engine.createGui(placeholder);
+					firePartVisible(selectedPart);
+					firePartBroughtToTop(selectedPart);
 				}
 			}
 		}
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java
index 1267f1856e4..6815c4da6c0 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java
@@ -22,12 +22,9 @@ import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.ValidationStatusProvider;
 import org.eclipse.core.databinding.observable.IChangeListener;
 import org.eclipse.core.databinding.observable.IObservable;
-import org.eclipse.core.databinding.observable.IStaleListener;
 import org.eclipse.core.databinding.observable.ObservableTracker;
-import org.eclipse.core.databinding.observable.StaleEvent;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.list.ListDiffEntry;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.util.Policy;
@@ -67,34 +64,28 @@ public class DialogPageSupport {
 	private IObservableValue<ValidationStatusProvider> aggregateStatusProvider;
 	private boolean uiChanged = false;
 	private IChangeListener uiChangeListener = event -> handleUIChanged();
-	private IListChangeListener<ValidationStatusProvider> validationStatusProvidersListener = new IListChangeListener<ValidationStatusProvider>() {
-		@Override
-		public void handleListChange(ListChangeEvent<? extends ValidationStatusProvider> event) {
-			for (ListDiffEntry<? extends ValidationStatusProvider> listDiffEntry : event.diff.getDifferences()) {
-				IObservableList<IObservable> targets = listDiffEntry.getElement().getTargets();
-				if (listDiffEntry.isAddition()) {
-					targets.addListChangeListener(validationStatusProviderTargetsListener);
-					for (IObservable observable : targets) {
-						observable.addChangeListener(uiChangeListener);
-					}
-				} else {
-					targets.removeListChangeListener(validationStatusProviderTargetsListener);
-					for (IObservable observable : targets) {
-						observable.removeChangeListener(uiChangeListener);
-					}
+	private IListChangeListener<ValidationStatusProvider> validationStatusProvidersListener = event -> {
+		for (ListDiffEntry<? extends ValidationStatusProvider> listDiffEntry : event.diff.getDifferences()) {
+			IObservableList<IObservable> targets = listDiffEntry.getElement().getTargets();
+			if (listDiffEntry.isAddition()) {
+				targets.addListChangeListener(this.validationStatusProviderTargetsListener);
+				for (IObservable observable : targets) {
+					observable.addChangeListener(uiChangeListener);
+				}
+			} else {
+				targets.removeListChangeListener(this.validationStatusProviderTargetsListener);
+				for (IObservable observable : targets) {
+					observable.removeChangeListener(uiChangeListener);
 				}
 			}
 		}
 	};
-	private IListChangeListener<IObservable> validationStatusProviderTargetsListener = new IListChangeListener<IObservable>() {
-		@Override
-		public void handleListChange(ListChangeEvent<? extends IObservable> event) {
-			for (ListDiffEntry<? extends IObservable> listDiffEntry : event.diff.getDifferences()) {
-				if (listDiffEntry.isAddition()) {
-					listDiffEntry.getElement().addChangeListener(uiChangeListener);
-				} else {
-					listDiffEntry.getElement().removeChangeListener(uiChangeListener);
-				}
+	private IListChangeListener<IObservable> validationStatusProviderTargetsListener = event -> {
+		for (ListDiffEntry<? extends IObservable> listDiffEntry : event.diff.getDifferences()) {
+			if (listDiffEntry.isAddition()) {
+				listDiffEntry.getElement().addChangeListener(uiChangeListener);
+			} else {
+				listDiffEntry.getElement().removeChangeListener(uiChangeListener);
 			}
 		}
 	};
@@ -152,12 +143,9 @@ public class DialogPageSupport {
 
 		aggregateStatusProvider.addValueChangeListener(event -> statusProviderChanged());
 		dialogPage.getShell().addListener(SWT.Dispose, event -> dispose());
-		aggregateStatusProvider.addStaleListener(new IStaleListener() {
-			@Override
-			public void handleStale(StaleEvent staleEvent) {
-				currentStatusStale = true;
-				handleStatusChanged();
-			}
+		aggregateStatusProvider.addStaleListener(staleEvent -> {
+			currentStatusStale = true;
+			handleStatusChanged();
 		});
 		statusProviderChanged();
 		dbc.getValidationStatusProviders().addListChangeListener(validationStatusProvidersListener);
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.java
index d632d46fb46..8b97aa6e90c 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/dialog/TitleAreaDialogSupport.java
@@ -22,13 +22,11 @@ package org.eclipse.jface.databinding.dialog;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.ValidationStatusProvider;
-import org.eclipse.core.databinding.observable.ChangeEvent;
 import org.eclipse.core.databinding.observable.IChangeListener;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.ObservableTracker;
 import org.eclipse.core.databinding.observable.list.IListChangeListener;
 import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.ListChangeEvent;
 import org.eclipse.core.databinding.observable.list.ListDiffEntry;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.util.Policy;
@@ -68,40 +66,29 @@ public class TitleAreaDialogSupport {
 	private IValidationMessageProvider messageProvider = new ValidationMessageProvider();
 	private IObservableValue<ValidationStatusProvider> aggregateStatusProvider;
 	private boolean uiChanged = false;
-	private IChangeListener uiChangeListener = new IChangeListener() {
-		@Override
-		public void handleChange(ChangeEvent event) {
-			handleUIChanged();
-		}
-	};
-	private IListChangeListener<ValidationStatusProvider> validationStatusProvidersListener = new IListChangeListener<ValidationStatusProvider>() {
-		@Override
-		public void handleListChange(ListChangeEvent<? extends ValidationStatusProvider> event) {
-			for (ListDiffEntry<? extends ValidationStatusProvider> listDiffEntry : event.diff.getDifferences()) {
-				IObservableList<IObservable> targets = listDiffEntry.getElement().getTargets();
-				if (listDiffEntry.isAddition()) {
-					targets.addListChangeListener(validationStatusProviderTargetsListener);
-					for (IObservable observable : targets) {
-						observable.addChangeListener(uiChangeListener);
-					}
-				} else {
-					targets.removeListChangeListener(validationStatusProviderTargetsListener);
-					for (IObservable observable : targets) {
-						observable.removeChangeListener(uiChangeListener);
-					}
+	private IChangeListener uiChangeListener = event -> handleUIChanged();
+	private IListChangeListener<ValidationStatusProvider> validationStatusProvidersListener = event -> {
+		for (ListDiffEntry<? extends ValidationStatusProvider> listDiffEntry : event.diff.getDifferences()) {
+			IObservableList<IObservable> targets = listDiffEntry.getElement().getTargets();
+			if (listDiffEntry.isAddition()) {
+				targets.addListChangeListener(this.validationStatusProviderTargetsListener);
+				for (IObservable observable : targets) {
+					observable.addChangeListener(uiChangeListener);
+				}
+			} else {
+				targets.removeListChangeListener(this.validationStatusProviderTargetsListener);
+				for (IObservable observable : targets) {
+					observable.removeChangeListener(uiChangeListener);
 				}
 			}
 		}
 	};
-	private IListChangeListener<IObservable> validationStatusProviderTargetsListener = new IListChangeListener<IObservable>() {
-		@Override
-		public void handleListChange(ListChangeEvent<? extends IObservable> event) {
-			for (ListDiffEntry<? extends IObservable> listDiffEntry : event.diff.getDifferences()) {
-				if (listDiffEntry.isAddition()) {
-					listDiffEntry.getElement().addChangeListener(uiChangeListener);
-				} else {
-					listDiffEntry.getElement().removeChangeListener(uiChangeListener);
-				}
+	private IListChangeListener<IObservable> validationStatusProviderTargetsListener = event -> {
+		for (ListDiffEntry<? extends IObservable> listDiffEntry : event.diff.getDifferences()) {
+			if (listDiffEntry.isAddition()) {
+				listDiffEntry.getElement().addChangeListener(uiChangeListener);
+			} else {
+				listDiffEntry.getElement().removeChangeListener(uiChangeListener);
 			}
 		}
 	};
diff --git a/bundles/org.eclipse.jface.notifications/src/org/eclipse/jface/notifications/AbstractNotificationPopup.java b/bundles/org.eclipse.jface.notifications/src/org/eclipse/jface/notifications/AbstractNotificationPopup.java
index 3dd674adaec..d177aaa4f5e 100644
--- a/bundles/org.eclipse.jface.notifications/src/org/eclipse/jface/notifications/AbstractNotificationPopup.java
+++ b/bundles/org.eclipse.jface.notifications/src/org/eclipse/jface/notifications/AbstractNotificationPopup.java
@@ -22,7 +22,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.notifications.internal.AnimationUtil;
 import org.eclipse.jface.notifications.internal.AnimationUtil.FadeJob;
-import org.eclipse.jface.notifications.internal.AnimationUtil.IFadeListener;
 import org.eclipse.jface.notifications.internal.CommonImages;
 import org.eclipse.jface.notifications.internal.Messages;
 import org.eclipse.jface.resource.JFaceResources;
@@ -74,22 +73,18 @@ public abstract class AbstractNotificationPopup extends Window {
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			if (!AbstractNotificationPopup.this.display.isDisposed()) {
-				AbstractNotificationPopup.this.display.asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						Shell shell = AbstractNotificationPopup.this.getShell();
-						if (shell == null || shell.isDisposed()) {
-							return;
-						}
-
-						if (isMouseOver(shell)) {
-							scheduleAutoClose();
-							return;
-						}
+				AbstractNotificationPopup.this.display.asyncExec(() -> {
+					Shell shell = AbstractNotificationPopup.this.getShell();
+					if (shell == null || shell.isDisposed()) {
+						return;
+					}
 
-						AbstractNotificationPopup.this.closeFade();
+					if (isMouseOver(shell)) {
+						scheduleAutoClose();
+						return;
 					}
 
+					AbstractNotificationPopup.this.closeFade();
 				});
 			}
 			if (monitor.isCanceled()) {
@@ -144,16 +139,13 @@ public abstract class AbstractNotificationPopup extends Window {
 			this.shell.setAlpha(0);
 		}
 		this.shell.setVisible(true);
-		this.fadeJob = AnimationUtil.fadeIn(this.shell, new IFadeListener() {
-			@Override
-			public void faded(Shell shell, int alpha) {
-				if (shell.isDisposed()) {
-					return;
-				}
+		this.fadeJob = AnimationUtil.fadeIn(this.shell, (shell, alpha) -> {
+			if (shell.isDisposed()) {
+				return;
+			}
 
-				if (alpha == 255) {
-					scheduleAutoClose();
-				}
+			if (alpha == 255) {
+				scheduleAutoClose();
 			}
 		});
 
@@ -178,29 +170,23 @@ public abstract class AbstractNotificationPopup extends Window {
 		if (this.fadeJob != null) {
 			this.fadeJob.cancelAndWait(false);
 		}
-		this.fadeJob = AnimationUtil.fadeOut(getShell(), new IFadeListener() {
-			@Override
-			public void faded(Shell shell, int alpha) {
-				if (!shell.isDisposed()) {
-					if (alpha == 0) {
-						shell.close();
-					} else if (isMouseOver(shell)) {
-						if (AbstractNotificationPopup.this.fadeJob != null) {
-							AbstractNotificationPopup.this.fadeJob.cancelAndWait(false);
-						}
-						AbstractNotificationPopup.this.fadeJob = AnimationUtil.fastFadeIn(shell, new IFadeListener() {
-							@Override
-							public void faded(Shell shell, int alpha) {
-								if (shell.isDisposed()) {
-									return;
-								}
-
-								if (alpha == 255) {
-									scheduleAutoClose();
-								}
-							}
-						});
+		this.fadeJob = AnimationUtil.fadeOut(getShell(), (shell, alpha) -> {
+			if (!shell.isDisposed()) {
+				if (alpha == 0) {
+					shell.close();
+				} else if (isMouseOver(shell)) {
+					if (AbstractNotificationPopup.this.fadeJob != null) {
+						AbstractNotificationPopup.this.fadeJob.cancelAndWait(false);
 					}
+					AbstractNotificationPopup.this.fadeJob = AnimationUtil.fastFadeIn(shell, (shell1, alpha1) -> {
+						if (shell1.isDisposed()) {
+							return;
+						}
+
+						if (alpha1 == 255) {
+							scheduleAutoClose();
+						}
+					});
 				}
 			}
 		});
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/SashFactory.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/SashFactory.java
index 61ce5e3892b..aa62ee4d9ca 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/SashFactory.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/widgets/SashFactory.java
@@ -65,7 +65,7 @@ import org.eclipse.swt.widgets.Sash;
 public final class SashFactory extends AbstractControlFactory<SashFactory, Sash> {
 
 	private SashFactory(int style) {
-		super(SashFactory.class, (composite) -> new Sash(composite, style));
+		super(SashFactory.class, composite -> new Sash(composite, style));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java
index 4a0f5750550..f66adf34cc4 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java
@@ -19,7 +19,6 @@ import java.util.Iterator;
 import java.util.Set;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.ActivityManagerEvent;
 import org.eclipse.ui.activities.IActivity;
@@ -66,29 +65,25 @@ final class ActivityPersistanceHelper {
 	/**
 	 * The listener that responds to preference changes
 	 */
-	private final IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() {
-
-		@Override
-		public void propertyChange(PropertyChangeEvent event) {
-			// dont process property events if we're in the process of
-			// serializing state.
-			if (!saving && event.getProperty().startsWith(PREFIX)) {
-				String activityId = event.getProperty().substring(PREFIX.length());
-				IWorkbenchActivitySupport support = PlatformUI.getWorkbench().getActivitySupport();
-				IActivityManager activityManager = support.getActivityManager();
-
-				boolean enabled = Boolean.parseBoolean(event.getNewValue().toString());
-				// if we're turning an activity off we'll need to create its dependency tree to
-				// ensuure that all dependencies are also disabled.
-				Set<String> set = new HashSet<>(activityManager.getEnabledActivityIds());
-				if (enabled == false) {
-					Set<String> dependencies = buildDependencies(activityManager, activityId);
-					set.removeAll(dependencies);
-				} else {
-					set.add(activityId);
-				}
-				support.setEnabledActivityIds(set);
+	private final IPropertyChangeListener propertyChangeListener = event -> {
+		// dont process property events if we're in the process of
+		// serializing state.
+		if (!this.saving && event.getProperty().startsWith(PREFIX)) {
+			String activityId = event.getProperty().substring(PREFIX.length());
+			IWorkbenchActivitySupport support = PlatformUI.getWorkbench().getActivitySupport();
+			IActivityManager activityManager = support.getActivityManager();
+
+			boolean enabled = Boolean.parseBoolean(event.getNewValue().toString());
+			// if we're turning an activity off we'll need to create its dependency tree to
+			// ensuure that all dependencies are also disabled.
+			Set<String> set = new HashSet<>(activityManager.getEnabledActivityIds());
+			if (enabled == false) {
+				Set<String> dependencies = buildDependencies(activityManager, activityId);
+				set.removeAll(dependencies);
+			} else {
+				set.add(activityId);
 			}
+			support.setEnabledActivityIds(set);
 		}
 	};
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java
index 30dc9776797..cd7e40ab76d 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchImages.java
@@ -102,9 +102,7 @@ public/* final */class WorkbenchImages {
 	 */
 	private static final void declareImage(String key, String path, boolean shared) {
 		ImageDescriptor desc = ImageDescriptor
-				.createFromURLSupplier(true, () -> {
-					return BundleUtility.find(PlatformUI.PLUGIN_ID, path);
-				});
+				.createFromURLSupplier(true, () -> BundleUtility.find(PlatformUI.PLUGIN_ID, path));
 		declareImage(key, desc, shared);
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index 1d3f4abff5d..258e914fa29 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -316,24 +316,21 @@ public class WorkbenchWindow implements IWorkbenchWindow {
 
 	private IPerspectiveDescriptor perspective;
 
-	private EventHandler windowWidgetHandler = new EventHandler() {
-		@Override
-		public void handleEvent(Event event) {
-			if (event.getProperty(UIEvents.EventTags.ELEMENT) == model
-					&& event.getProperty(UIEvents.EventTags.NEW_VALUE) == null) {
-				// HandledContributionItem.toolItemUpdater.removeWindowRunnable(menuUpdater);
-				manageChanges = false;
-				canUpdateMenus = false;
-				menuUpdater = null;
-
-				MMenu menu = model.getMainMenu();
-				if (menu != null) {
-					engine.removeGui(menu);
-					model.setMainMenu(null);
-				}
-
-				eventBroker.unsubscribe(windowWidgetHandler);
+	private EventHandler windowWidgetHandler = event -> {
+		if (event.getProperty(UIEvents.EventTags.ELEMENT) == model
+				&& event.getProperty(UIEvents.EventTags.NEW_VALUE) == null) {
+			// HandledContributionItem.toolItemUpdater.removeWindowRunnable(menuUpdater);
+			this.manageChanges = false;
+			this.canUpdateMenus = false;
+			this.menuUpdater = null;
+
+			MMenu menu = model.getMainMenu();
+			if (menu != null) {
+				engine.removeGui(menu);
+				model.setMainMenu(null);
 			}
+
+			eventBroker.unsubscribe(this.windowWidgetHandler);
 		}
 	};
 
@@ -517,12 +514,7 @@ public class WorkbenchWindow implements IWorkbenchWindow {
 				}
 			});
 
-			windowContext.set(IWindowCloseHandler.class.getName(), new IWindowCloseHandler() {
-				@Override
-				public boolean close(MWindow window) {
-					return getWindowAdvisor().preWindowShellClose() && WorkbenchWindow.this.close();
-				}
-			});
+			windowContext.set(IWindowCloseHandler.class.getName(), (IWindowCloseHandler) window -> getWindowAdvisor().preWindowShellClose() && WorkbenchWindow.this.close());
 
 			final ISaveHandler defaultSaveHandler = windowContext.get(ISaveHandler.class);
 			final PartServiceSaveHandler localSaveHandler = new WWinPartServiceSaveHandler() {
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/EditMask.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/EditMask.java
index c383df039ac..58bf9d410d9 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/EditMask.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/mask/EditMask.java
@@ -19,12 +19,10 @@ import java.beans.PropertyChangeSupport;
 
 import org.eclipse.jface.examples.databinding.mask.internal.EditMaskParser;
 import org.eclipse.jface.examples.databinding.mask.internal.SWTUtil;
-import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Display;
@@ -331,34 +329,31 @@ public class EditMask {
 	protected String oldRawText = "";
 	protected boolean replacedSelectedText = false;
 
-	private VerifyListener verifyListener = new VerifyListener() {
-		@Override
-		public void verifyText(VerifyEvent e) {
-			// If the edit mask is already full, don't let the user type
-			// any new characters
-			if (editMaskParser.isComplete() && // should eventually be .isFull() to account for optional characters
-				e.start == e.end &&
-				e.text.length() > 0)
-			{
-				e.doit=false;
-				return;
-			}
+	private VerifyListener verifyListener = e -> {
+		// If the edit mask is already full, don't let the user type
+		// any new characters
+		if (editMaskParser.isComplete() && // should eventually be .isFull() to account for optional characters
+			e.start == e.end &&
+			e.text.length() > 0)
+		{
+			e.doit=false;
+			return;
+		}
 
-			oldSelection = selection;
-			Point selectionRange = text.getSelection();
-			selection = selectionRange.x;
+		oldSelection = selection;
+		Point selectionRange = text.getSelection();
+		selection = selectionRange.x;
 
-			if (!updating) {
-				replacedSelectedText = false;
-				if (selectionRange.y - selectionRange.x > 0 && e.text.length() > 0) {
-					replacedSelectedText = true;
-				}
-				// If the machine is loaded down (ie: spyware, malware), we might
-				// get another keystroke before asyncExec can process, so we use
-				// greedyExec instead.
-				SWTUtil.greedyExec(Display.getCurrent(), updateTextField);
-//				Display.getCurrent().asyncExec(updateTextField);
+		if (!updating) {
+			replacedSelectedText = false;
+			if (selectionRange.y - selectionRange.x > 0 && e.text.length() > 0) {
+				replacedSelectedText = true;
 			}
+			// If the machine is loaded down (ie: spyware, malware), we might
+			// get another keystroke before asyncExec can process, so we use
+			// greedyExec instead.
+			SWTUtil.greedyExec(Display.getCurrent(), this.updateTextField);
+//				Display.getCurrent().asyncExec(updateTextField);
 		}
 	};
 
@@ -446,13 +441,10 @@ public class EditMask {
 		}
 	};
 
-	private DisposeListener disposeListener = new DisposeListener() {
-		@Override
-		public void widgetDisposed(DisposeEvent e) {
-			text.removeVerifyListener(verifyListener);
-			text.removeFocusListener(focusListener);
-			text.removeDisposeListener(disposeListener);
-		}
+	private DisposeListener disposeListener = e -> {
+		text.removeVerifyListener(verifyListener);
+		text.removeFocusListener(focusListener);
+		text.removeDisposeListener(this.disposeListener);
 	};
 
 }
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
index dedf770bdcb..808360cf5d2 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
@@ -70,7 +70,6 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
-import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
@@ -89,12 +88,9 @@ public class PartRenderingEngineTests {
 	@Inject
 	private MApplication application;
 
-	private LogListener listener = new LogListener() {
-		@Override
-		public void logged(LogEntry entry) {
-			if (!logged) {
-				logged = entry.getLogLevel() == LogLevel.ERROR;
-			}
+	private LogListener listener = entry -> {
+		if (!this.logged) {
+			this.logged = entry.getLogLevel() == LogLevel.ERROR;
 		}
 	};
 	private boolean logged = false;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/SmartImportTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/SmartImportTests.java
index 4be82285790..d48f8944c89 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/SmartImportTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/SmartImportTests.java
@@ -470,12 +470,9 @@ public class SmartImportTests extends UITestCase {
 	@Test
 	public void testBug559600() throws Exception {
 		AtomicInteger errors = new AtomicInteger();
-		ILogListener errorListener = new ILogListener() {
-			@Override
-			public void logging(IStatus status, String plugin) {
-				if (status.getSeverity() == IStatus.ERROR) {
-					errors.incrementAndGet();
-				}
+		ILogListener errorListener = (status, plugin) -> {
+			if (status.getSeverity() == IStatus.ERROR) {
+				errors.incrementAndGet();
 			}
 		};