Bug 497049 - Move o.e.help.base to Java 8

Bump BREE and version to reflect BREE change.
Convert to lambdas where feasible.

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

9 files changed, 34 insertions, 65 deletions

diff --git a/org.eclipse.help.base/.classpath b/org.eclipse.help.base/.classpath
index f3c63f8f7..c647769d6 100644
--- a/org.eclipse.help.base/.classpath
+++ b/org.eclipse.help.base/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<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="src" path="src"/>
 	<classpathentry kind="src" output="bin2" path="src_ant"/>
 	<classpathentry kind="src" path="src_demo"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
index b810cff5d..ef5a06e81 100644
--- a/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.help.base/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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.7

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.7

+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

@@ -98,7 +98,7 @@ 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.7

+org.eclipse.jdt.core.compiler.source=1.8

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
index e1cb68fab..1089d1a7d 100644
--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_base_plugin_name
 Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.2.0.qualifier
 Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -48,5 +48,5 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.200";resolution:=option
  org.eclipse.core.net;bundle-version="1.2.200"
 Import-Package: com.ibm.icu.text,
  org.eclipse.equinox.http.jetty;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.help.base/pom.xml b/org.eclipse.help.base/pom.xml
index cb3fa6d93..bf5e34b3e 100644
--- a/org.eclipse.help.base/pom.xml
+++ b/org.eclipse.help.base/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.help</groupId>
   <artifactId>org.eclipse.help.base</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
+  <version>4.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
index f7416a4bb..5140f023e 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2016 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
@@ -16,8 +16,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
 import org.eclipse.help.AbstractContentExtensionProvider;
 import org.eclipse.help.IContentExtension;
 import org.eclipse.help.internal.UAElement;
@@ -33,12 +31,7 @@ public class RemoteExtensionProvider extends AbstractContentExtensionProvider {
 	private DocumentReader reader;
 
 	public RemoteExtensionProvider() {
-		RemoteHelp.addPreferenceChangeListener(new IPreferenceChangeListener() {
-			@Override
-			public void preferenceChange(PreferenceChangeEvent event) {
-				contentChanged();
-			}
-		});
+		RemoteHelp.addPreferenceChangeListener(event -> contentChanged());
 	}
 
 	@Override
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
index 1ee4e55b8..beb90e4e4 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2016 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
@@ -16,8 +16,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
 import org.eclipse.help.AbstractIndexProvider;
 import org.eclipse.help.IIndexContribution;
 import org.eclipse.help.internal.base.HelpBasePlugin;
@@ -38,12 +36,7 @@ public class RemoteIndexProvider extends AbstractIndexProvider {
 	 * help preference changes.
 	 */
 	public RemoteIndexProvider() {
-		RemoteHelp.addPreferenceChangeListener(new IPreferenceChangeListener() {
-			@Override
-			public void preferenceChange(PreferenceChangeEvent event) {
-				contentChanged();
-			}
-		});
+		RemoteHelp.addPreferenceChangeListener(event -> contentChanged());
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
index da9064d3b..bc794d9d0 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteTocProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 IBM Corporation and others.
+ * Copyright (c) 2006, 2016 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
@@ -14,8 +14,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
 import org.eclipse.help.AbstractTocProvider;
 import org.eclipse.help.ITocContribution;
 import org.eclipse.help.internal.base.HelpBasePlugin;
@@ -37,12 +35,7 @@ public class RemoteTocProvider extends AbstractTocProvider {
 	 * help preference changes.
 	 */
 	public RemoteTocProvider() {
-		RemoteHelp.addPreferenceChangeListener(new IPreferenceChangeListener() {
-			@Override
-			public void preferenceChange(PreferenceChangeEvent event) {
-				contentChanged();
-			}
-		});
+		RemoteHelp.addPreferenceChangeListener(event -> contentChanged());
 	}
 
 	/*
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
index 0b91df13e..2b66088e5 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchProgressMonitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 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
@@ -166,26 +166,20 @@ public class SearchProgressMonitor implements IProgressMonitor {
 		progressMonitors.put(locale, pm);
 
 		// spawn a thread that will cause indexing if needed
-		Thread indexer = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					BaseHelpSystem.getSearchManager().search(
-							new DummySearchQuery(locale), dummy_collector, pm);
-				} catch (OperationCanceledException oce) {
-					// operation cancelled
-					// throw out the progress monitor
-					progressMonitors.remove(locale);
-				} catch (Exception e) {
-					progressMonitors.remove(locale);
-					if (HelpBasePlugin.getDefault() != null) {
-						HelpBasePlugin
-								.logError(
-										"Problem occurred during indexing of documentation.", //$NON-NLS-1$
-										e);
-					} else {
-						// Plugin has been shut down
-					}
+		Thread indexer = new Thread(() -> {
+			try {
+				BaseHelpSystem.getSearchManager().search(new DummySearchQuery(locale), dummy_collector, pm);
+			} catch (OperationCanceledException oce) {
+				// operation cancelled
+				// throw out the progress monitor
+				progressMonitors.remove(locale);
+			} catch (Exception e) {
+				progressMonitors.remove(locale);
+				if (HelpBasePlugin.getDefault() != null) {
+					HelpBasePlugin.logError("Problem occurred during indexing of documentation.", //$NON-NLS-1$
+							e);
+				} else {
+					// Plugin has been shut down
 				}
 			}
 		});
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
index 347bc6d95..beac476e4 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/EclipseConnection.java
@@ -14,7 +14,6 @@ import java.io.*;
 import java.net.*;
 import java.util.Properties;
 
-import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 
 import org.eclipse.help.internal.base.util.ProxyUtil;
@@ -57,16 +56,13 @@ public class EclipseConnection {
 				// The following allows the connection to
 				// continue even if the default rules for
 				// URL hostname verification fail.
-				secureConnection.setHostnameVerifier(new HostnameVerifier() {
-					@Override
-					public boolean verify(String urlHostName, javax.net.ssl.SSLSession session) {
-						if (Options.isDebug()) {
-							System.out.println("Warning: URL Host: " //$NON-NLS-1$
-									+ urlHostName + " vs. " //$NON-NLS-1$
-									+ session.getPeerHost());
-						}
-			            return true;
+				secureConnection.setHostnameVerifier((urlHostName, session) -> {
+					if (Options.isDebug()) {
+						System.out.println("Warning: URL Host: " //$NON-NLS-1$
+								+ urlHostName + " vs. " //$NON-NLS-1$
+								+ session.getPeerHost());
 					}
+					return true;
 				});
 			}
 			if (Options.isDebug()) {