diff options
author | Alexander Kurtakov | 2016-06-30 06:49:06 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-06-30 06:49:06 +0000 |
commit | 3ac95556fa5e580e02a3f50f03799f652223bd24 (patch) | |
tree | 67f7e5989b36f418c7cd1abc675148abc6091a31 | |
parent | c40944248f581bfe0275ac3452a2467f6e536fb9 (diff) | |
download | eclipse.platform.ua-3ac95556fa5e580e02a3f50f03799f652223bd24.tar.gz eclipse.platform.ua-3ac95556fa5e580e02a3f50f03799f652223bd24.tar.xz eclipse.platform.ua-3ac95556fa5e580e02a3f50f03799f652223bd24.zip |
Bug 497050 - Move o.e.help to Java 8
Bump BREE and version to reflect the BREE change.
Convert to lambda where feasible.
Change-Id: Iba3c2516d9360f62247dcf1f83a7677a80c78ec7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r-- | org.eclipse.help/.classpath | 4 | ||||
-rw-r--r-- | org.eclipse.help/.settings/org.eclipse.jdt.core.prefs | 6 | ||||
-rw-r--r-- | org.eclipse.help/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.help/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java | 36 |
5 files changed, 20 insertions, 32 deletions
diff --git a/org.eclipse.help/.classpath b/org.eclipse.help/.classpath index b277a8ac8..eca7bdba8 100644 --- a/org.eclipse.help/.classpath +++ b/org.eclipse.help/.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/JavaSE-1.7"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.help/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help/.settings/org.eclipse.jdt.core.prefs index c20481bad..8e317e687 100644 --- a/org.eclipse.help/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.help/.settings/org.eclipse.jdt.core.prefs @@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul 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.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -96,7 +96,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,HELP diff --git a/org.eclipse.help/META-INF/MANIFEST.MF b/org.eclipse.help/META-INF/MANIFEST.MF index 5313e2b7f..3a405d1fa 100644 --- a/org.eclipse.help/META-INF/MANIFEST.MF +++ b/org.eclipse.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %help_plugin_name Bundle-SymbolicName: org.eclipse.help; singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.8.0.qualifier Bundle-Activator: org.eclipse.help.internal.HelpPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -67,5 +67,5 @@ Import-Package: com.ibm.icu.text;version="3.8.0", org.w3c.dom, org.xml.sax, org.xml.sax.helpers -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.help/pom.xml b/org.eclipse.help/pom.xml index b717788f1..c4699f4a2 100644 --- a/org.eclipse.help/pom.xml +++ b/org.eclipse.help/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.help</groupId> <artifactId>org.eclipse.help</artifactId> - <version>3.7.0-SNAPSHOT</version> + <version>3.8.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> diff --git a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java index 0b7dfae79..fe49730eb 100644 --- a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java +++ b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java @@ -30,8 +30,6 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionDelta; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IRegistryChangeEvent; -import org.eclipse.core.runtime.IRegistryChangeListener; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.help.IHelpContentProducer; @@ -91,28 +89,18 @@ public class ResourceLocator { } } static { - Platform.getExtensionRegistry().addRegistryChangeListener(new IRegistryChangeListener() { - - /* - * (non-Javadoc) - * - * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) - */ - @Override - public void registryChanged(IRegistryChangeEvent event) { - IExtensionDelta[] deltas = event.getExtensionDeltas(HelpPlugin.PLUGIN_ID, - CONTENTPRODUCER_XP_NAME); - for (int i = 0; i < deltas.length; i++) { - IExtension extension = deltas[i].getExtension(); - String affectedPlugin = extension.getContributor().getName(); - // reset producer for the affected plugin, - // it will be recreated on demand - synchronized (contentProducers) { - Object obj = contentProducers.get(affectedPlugin); - if (obj instanceof ProducerDescriptor) { - ProducerDescriptor desc = (ProducerDescriptor) obj; - desc.reset(); - } + Platform.getExtensionRegistry().addRegistryChangeListener(event -> { + IExtensionDelta[] deltas = event.getExtensionDeltas(HelpPlugin.PLUGIN_ID, CONTENTPRODUCER_XP_NAME); + for (int i = 0; i < deltas.length; i++) { + IExtension extension = deltas[i].getExtension(); + String affectedPlugin = extension.getContributor().getName(); + // reset producer for the affected plugin, + // it will be recreated on demand + synchronized (contentProducers) { + Object obj = contentProducers.get(affectedPlugin); + if (obj instanceof ProducerDescriptor) { + ProducerDescriptor desc = (ProducerDescriptor) obj; + desc.reset(); } } } |