Bug 529811 - Convert ole win32 examples to Java 8

Convert ole win32 examples to Java 8 to kep it in sync with rest of swt
git repo.

Change-Id: I88be7760b3d98a159a9404e985b8a1f16d3d9df8
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

7 files changed, 231 insertions, 167 deletions

diff --git a/examples/org.eclipse.swt.examples.ole.win32/.classpath b/examples/org.eclipse.swt.examples.ole.win32/.classpath
index b7464f3ca2..eca7bdba8f 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/.classpath
+++ b/examples/org.eclipse.swt.examples.ole.win32/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/examples/org.eclipse.swt.examples.ole.win32/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.swt.examples.ole.win32/.settings/org.eclipse.jdt.core.prefs
index aaad86939f..cf0e05305d 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.swt.examples.ole.win32/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,111 @@
-#Mon Dec 11 15:13:54 EST 2006
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF
index 122563bb05..9f571408d9 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.SWTOLEExample.name
 Bundle-SymbolicName: org.eclipse.swt.examples.ole.win32; singleton:=true
-Bundle-Version: 3.106.100.qualifier
+Bundle-Version: 3.107.0.qualifier
 Bundle-Activator: org.eclipse.swt.examples.ole.win32.OlePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.ui,
  org.eclipse.swt
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.swt.examples.ole.win32
diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
index ea2303e913..dd05640fa6 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml
+++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  Copyright (c) 2012, 2018 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.swt</groupId>
   <artifactId>org.eclipse.swt.examples.ole.win32</artifactId>
-  <version>3.106.100-SNAPSHOT</version>
+  <version>3.107.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java
index 11724a6679..12fb42e320 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java
+++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OLEExample.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -57,11 +57,7 @@ public class OLEExample {
 		
 		MenuItem menuFileExit = new MenuItem(menuFile, SWT.CASCADE);
 		menuFileExit.setText("Exit");
-		menuFileExit.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				shell.dispose();
-			}
-		});
+		menuFileExit.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> shell.dispose()));
 	}
 
 	OleClientSite createSite(OleFrame frame, String progID) {
@@ -259,54 +255,43 @@ public class OLEExample {
 
 		Button excelButton = new Button(buttons, SWT.RADIO);
 		excelButton.setText("New Excel Sheet");
-		excelButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button) e.widget).getSelection())
-					newClientSite("Excel.Sheet");
-			}
-		});
+		excelButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+			if (((Button) e.widget).getSelection())
+				newClientSite("Excel.Sheet");
+		}));
 		Button mediaPlayerButton = new Button(buttons, SWT.RADIO);
 		mediaPlayerButton.setText("New MPlayer");
-		mediaPlayerButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button) e.widget).getSelection())
-					newClientSite("MPlayer");
-			}
-		});
+		mediaPlayerButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+			if (((Button) e.widget).getSelection())
+				newClientSite("MPlayer");
+		}));
 		Button powerPointButton = new Button(buttons, SWT.RADIO);
 		powerPointButton.setText("New PowerPoint Slide");
-		powerPointButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button) e.widget).getSelection())
-					newClientSite("PowerPoint.Slide");
-			}
-		});
+		powerPointButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+			if (((Button) e.widget).getSelection())
+				newClientSite("PowerPoint.Slide");
+		}));
 		Button wordButton = new Button(buttons, SWT.RADIO);
 		wordButton.setText("New Word Document");
-		wordButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button) e.widget).getSelection())
-					newClientSite("Word.Document");
-			}
-		});
+		wordButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+			if (((Button) e.widget).getSelection())
+				newClientSite("Word.Document");
+		}));
 		new Label(buttons, SWT.NONE);
 		Button openButton = new Button(buttons, SWT.RADIO);
 		openButton.setText("Open file...");
-		openButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button) e.widget).getSelection())
-					fileOpen();
-			}
-		});
+		openButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
+			if (((Button) e.widget).getSelection())
+				fileOpen();
+		}));
 		new Label(buttons, SWT.NONE);
 		closeButton = new Button(buttons, SWT.RADIO);
 		closeButton.setText("Close file");
-		closeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
+		closeButton.addSelectionListener(SelectionListener.widgetSelectedAdapter(e ->{
 				if (((Button) e.widget).getSelection())
 					disposeClient();
 			}
-		});	
+		));	
 		closeButton.setSelection(true);
 		
 		oleFrame = new OleFrame(displayArea, SWT.NONE);
diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java
index e9ba5d4c2d..94bc29f550 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java
+++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OleBrowserView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -60,6 +60,7 @@ public class OleBrowserView extends ViewPart {
 	 * 
 	 * @see ViewPart#createPartControl
 	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		displayArea = new Composite(parent, SWT.NONE);
 
@@ -76,6 +77,7 @@ public class OleBrowserView extends ViewPart {
 	/**
 	 * Cleanup
 	 */
+	@Override
 	public void dispose() {
 		if (activated) {
 			webControlSite.deactivateInPlaceClient();
@@ -91,6 +93,7 @@ public class OleBrowserView extends ViewPart {
 	 * 
 	 * @see org.eclipse.ui.part.ViewPart#setFocus
 	 */
+	@Override
 	public void setFocus()  {
 		webUrl.setFocus();
 	}
@@ -111,11 +114,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandBackward.setText(OlePlugin.getResourceString("browser.Back.text"));
 		webCommandBackward.setImage(OlePlugin.images[OlePlugin.biBack]);
 		webCommandBackward.setEnabled(false);
-		webCommandBackward.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.GoBack();
-			}
+		webCommandBackward.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.GoBack();
 		});
 	
 		// Add a button to navigate forward through previously visited web sites
@@ -124,11 +125,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandForward.setText(OlePlugin.getResourceString("browser.Forward.text"));
 		webCommandForward.setImage(OlePlugin.images[OlePlugin.biForward]);
 		webCommandForward.setEnabled(false);
-		webCommandForward.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.GoForward();
-			}
+		webCommandForward.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.GoForward();
 		});
 
 		// Add a separator
@@ -140,11 +139,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandHome.setText(OlePlugin.getResourceString("browser.Home.text"));
 		webCommandHome.setImage(OlePlugin.images[OlePlugin.biHome]);
 		webCommandHome.setEnabled(false);
-		webCommandHome.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.GoHome();
-			}
+		webCommandHome.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.GoHome();
 		});
 
 		// Add a button to abort web page loading
@@ -153,11 +150,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandStop.setText(OlePlugin.getResourceString("browser.Stop.text"));
 		webCommandStop.setImage(OlePlugin.images[OlePlugin.biStop]);
 		webCommandStop.setEnabled(false);
-		webCommandStop.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.Stop();
-			}
+		webCommandStop.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.Stop();
 		});
 
 		// Add a button to refresh the current web page
@@ -166,11 +161,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandRefresh.setText(OlePlugin.getResourceString("browser.Refresh.text"));
 		webCommandRefresh.setImage(OlePlugin.images[OlePlugin.biRefresh]);
 		webCommandRefresh.setEnabled(false);
-		webCommandRefresh.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.Refresh();
-			}
+		webCommandRefresh.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.Refresh();
 		});
 
 		// Add a separator
@@ -182,11 +175,9 @@ public class OleBrowserView extends ViewPart {
 		webCommandSearch.setText(OlePlugin.getResourceString("browser.Search.text"));
 		webCommandSearch.setImage(OlePlugin.images[OlePlugin.biSearch]);
 		webCommandSearch.setEnabled(false);
-		webCommandSearch.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				if (webBrowser == null) return;
-				webBrowser.GoSearch();
-			}
+		webCommandSearch.addListener(SWT.Selection, e -> {
+			if (webBrowser == null) return;
+			webBrowser.GoSearch();
 		});
 
 		// Add a text area for Users to enter a url
@@ -208,11 +199,8 @@ public class OleBrowserView extends ViewPart {
 		webUrl.setFont(OlePlugin.browserFont);
 		gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
 		webUrl.setLayoutData(gridData);
-		webUrl.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				webNavigateButton.getShell().setDefaultButton(webNavigateButton);
-			}
-		});
+		webUrl.addFocusListener(FocusListener
+				.focusGainedAdapter(e -> webNavigateButton.getShell().setDefaultButton(webNavigateButton)));
 	
 		// Add a button to navigate to the web site specified in the Text area defined above
 		webNavigateButton = new Button(addressBar, SWT.PUSH);
@@ -220,11 +208,9 @@ public class OleBrowserView extends ViewPart {
 		webNavigateButton.setLayoutData(gridData);
 		webNavigateButton.setText(OlePlugin.getResourceString("browser.Go.text"));
 		webNavigateButton.setFont(OlePlugin.browserFont);
-		webNavigateButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (webBrowser == null) return;
-				webBrowser.Navigate(webUrl.getText());
-			}
+		webNavigateButton.addListener(SWT.Selection, event -> {
+			if (webBrowser == null) return;
+			webBrowser.Navigate(webUrl.getText());
 		});
 	}
 
@@ -278,88 +264,80 @@ public class OleBrowserView extends ViewPart {
 		}
 
 		// Respond to ProgressChange events by updating the Progress bar
-		webControlSite.addEventListener(OleWebBrowser.ProgressChange, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				Variant progress = event.arguments[0];
-				Variant maxProgress = event.arguments[1];
-				if (progress == null || maxProgress == null)
-					return;
-				webProgress.setMaximum(maxProgress.getInt());
-				webProgress.setSelection(progress.getInt());
-			}
+		webControlSite.addEventListener(OleWebBrowser.ProgressChange, event -> {
+			Variant progress = event.arguments[0];
+			Variant maxProgress = event.arguments[1];
+			if (progress == null || maxProgress == null)
+				return;
+			webProgress.setMaximum(maxProgress.getInt());
+			webProgress.setSelection(progress.getInt());
 		});
 		
 		// Respond to StatusTextChange events by updating the Status Text label
-		webControlSite.addEventListener(OleWebBrowser.StatusTextChange, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				Variant statusText = event.arguments[0];
-				if (statusText == null)	return;
-				String text = statusText.getString();
-				if (text != null)
-					webStatus.setText(text);
-			}
+		webControlSite.addEventListener(OleWebBrowser.StatusTextChange, event -> {
+			Variant statusText = event.arguments[0];
+			if (statusText == null)	return;
+			String text = statusText.getString();
+			if (text != null)
+				webStatus.setText(text);
 		});
 		
 		// Listen for changes to the ready state and print out the current state 
-		webControlSite.addPropertyListener(OleWebBrowser.DISPID_READYSTATE, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				if (event.detail == OLE.PROPERTY_CHANGING) return;
-				int state = webBrowser.getReadyState();
-				switch (state) {
-					case OleWebBrowser.READYSTATE_UNINITIALIZED:
-						webStatus.setText(
-							OlePlugin.getResourceString("browser.State.Uninitialized.text"));
-						webCommandBackward.setEnabled(false);
-						webCommandForward.setEnabled(false);
-						webCommandHome.setEnabled(false);
-						webCommandRefresh.setEnabled(false);
-						webCommandStop.setEnabled(false);
-						webCommandSearch.setEnabled(false);
-						break;
-					case OleWebBrowser.READYSTATE_LOADING:
-						webStatus.setText(
-							OlePlugin.getResourceString("browser.State.Loading.text"));
-						webCommandHome.setEnabled(true);
-						webCommandRefresh.setEnabled(true);
-						webCommandStop.setEnabled(true);
-						webCommandSearch.setEnabled(true);
-						break;
-					case OleWebBrowser.READYSTATE_LOADED:
-						webStatus.setText(
-							OlePlugin.getResourceString("browser.State.Loaded.text"));
-						webCommandStop.setEnabled(true);
-						break;
-					case OleWebBrowser.READYSTATE_INTERACTIVE:
-						webStatus.setText(
-							OlePlugin.getResourceString("browser.State.Interactive.text"));
-						webCommandStop.setEnabled(true);
-						break;
-					case OleWebBrowser.READYSTATE_COMPLETE:
-						webStatus.setText(
-							OlePlugin.getResourceString("browser.State.Complete.text"));
-						webCommandStop.setEnabled(false);
-						break;
-				}
+		webControlSite.addPropertyListener(OleWebBrowser.DISPID_READYSTATE, event -> {
+			if (event.detail == OLE.PROPERTY_CHANGING) return;
+			int state = webBrowser.getReadyState();
+			switch (state) {
+				case OleWebBrowser.READYSTATE_UNINITIALIZED:
+					webStatus.setText(
+						OlePlugin.getResourceString("browser.State.Uninitialized.text"));
+					webCommandBackward.setEnabled(false);
+					webCommandForward.setEnabled(false);
+					webCommandHome.setEnabled(false);
+					webCommandRefresh.setEnabled(false);
+					webCommandStop.setEnabled(false);
+					webCommandSearch.setEnabled(false);
+					break;
+				case OleWebBrowser.READYSTATE_LOADING:
+					webStatus.setText(
+						OlePlugin.getResourceString("browser.State.Loading.text"));
+					webCommandHome.setEnabled(true);
+					webCommandRefresh.setEnabled(true);
+					webCommandStop.setEnabled(true);
+					webCommandSearch.setEnabled(true);
+					break;
+				case OleWebBrowser.READYSTATE_LOADED:
+					webStatus.setText(
+						OlePlugin.getResourceString("browser.State.Loaded.text"));
+					webCommandStop.setEnabled(true);
+					break;
+				case OleWebBrowser.READYSTATE_INTERACTIVE:
+					webStatus.setText(
+						OlePlugin.getResourceString("browser.State.Interactive.text"));
+					webCommandStop.setEnabled(true);
+					break;
+				case OleWebBrowser.READYSTATE_COMPLETE:
+					webStatus.setText(
+						OlePlugin.getResourceString("browser.State.Complete.text"));
+					webCommandStop.setEnabled(false);
+					break;
 			}
 		});
 
 		// Listen for changes to the active command states
-		webControlSite.addEventListener(OleWebBrowser.CommandStateChange, new OleListener() {
-			public void handleEvent(OleEvent event) {
-				if (event.type != OleWebBrowser.CommandStateChange) return;
-				final int commandID =
-					(event.arguments[0] != null) ? event.arguments[0].getInt() : 0;
-				final boolean commandEnabled =
-					(event.arguments[1] != null) ? event.arguments[1].getBoolean() : false;
-				
-				switch (commandID) {
-					case OleWebBrowser.CSC_NAVIGATEBACK:
-					 	webCommandBackward.setEnabled(commandEnabled);
-					 	break;
-					case OleWebBrowser.CSC_NAVIGATEFORWARD:
-					 	webCommandForward.setEnabled(commandEnabled);
-						break;
-				}
+		webControlSite.addEventListener(OleWebBrowser.CommandStateChange, event -> {
+			if (event.type != OleWebBrowser.CommandStateChange) return;
+			final int commandID =
+				(event.arguments[0] != null) ? event.arguments[0].getInt() : 0;
+			final boolean commandEnabled =
+				(event.arguments[1] != null) ? event.arguments[1].getBoolean() : false;
+			
+			switch (commandID) {
+				case OleWebBrowser.CSC_NAVIGATEBACK:
+				 	webCommandBackward.setEnabled(commandEnabled);
+				 	break;
+				case OleWebBrowser.CSC_NAVIGATEFORWARD:
+				 	webCommandForward.setEnabled(commandEnabled);
+					break;
 			}
 		});
 
diff --git a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java
index a55c2e3674..b172bea2b5 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java
+++ b/examples/org.eclipse.swt.examples.ole.win32/src/org/eclipse/swt/examples/ole/win32/OlePlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -55,7 +55,8 @@ public class OlePlugin extends AbstractUIPlugin {
 		plugin = this;
 	}
 	
-    public void start(BundleContext context) throws Exception {
+    @Override
+	public void start(BundleContext context) throws Exception {
         super.start(context);
         resourceBundle = Platform.getResourceBundle(getBundle());
     }
@@ -63,6 +64,7 @@ public class OlePlugin extends AbstractUIPlugin {
 	/**
 	 * Clean up
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		freeResources();
 		super.stop(context);