diff options
author | Alexander Kurtakov | 2015-12-08 08:45:19 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2015-12-08 09:09:58 +0000 |
commit | ab2f0dc191c584d9ca493d479de285794496d97a (patch) | |
tree | 4cd02d74992e80f45b730b119f44820580eccc10 /libhover | |
parent | b68d43fe7cc048777193c69aa984a1c0a55b8680 (diff) | |
download | org.eclipse.linuxtools-ab2f0dc191c584d9ca493d479de285794496d97a.tar.gz org.eclipse.linuxtools-ab2f0dc191c584d9ca493d479de285794496d97a.tar.xz org.eclipse.linuxtools-ab2f0dc191c584d9ca493d479de285794496d97a.zip |
libhover: Target Java 8.
Use lambdas where feasible.
Change-Id: If6d571f7d5667b3b1e9c7f1bbf4debd12eb2fb56
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/62173
Tested-by: Hudson CI
Diffstat (limited to 'libhover')
11 files changed, 21 insertions, 39 deletions
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.classpath b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.classpath index 098194ca4b..eca7bdba8f 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.classpath +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.classpath @@ -1,6 +1,6 @@ <?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.7"/> + <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="output" path="bin"/> diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.settings/org.eclipse.jdt.core.prefs b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.settings/org.eclipse.jdt.core.prefs index 3a76e2b650..89258f1dd4 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.settings/org.eclipse.jdt.core.prefs +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/.settings/org.eclipse.jdt.core.prefs @@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 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.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 @@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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 diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/META-INF/MANIFEST.MF index 80fa4f4bfb..f74dcc7074 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/META-INF/MANIFEST.MF +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.ui, org.cyberneko.html;bundle-version="1.9.14", org.apache.xerces;bundle-version="2.9.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %provider diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/DevHelpToc.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/DevHelpToc.java index 6c94273f24..c79768d439 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/DevHelpToc.java +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/DevHelpToc.java @@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.cdt.libhover.devhelp; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.core.filesystem.EFS; @@ -60,14 +59,7 @@ public class DevHelpToc implements IToc { IFileSystem fs = EFS.getLocalFileSystem(); IFileStore htmlDir = fs.getStore(devhelpLocation); IFileStore[] files = htmlDir.childStores(EFS.NONE, null); - Arrays.sort(files, new Comparator<IFileStore>() { - - @Override - public int compare(IFileStore arg0, IFileStore arg1) { - return (arg0.getName().compareToIgnoreCase(arg1.getName())); - } - - }); + Arrays.sort(files, (arg0, arg1) -> (arg0.getName().compareToIgnoreCase(arg1.getName()))); for (IFileStore file: files) { String name = file.fetchInfo().getName(); if (fs.getStore( diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/preferences/LibHoverPreferencePage.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/preferences/LibHoverPreferencePage.java index d69ca539a8..cd401c6763 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/preferences/LibHoverPreferencePage.java +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/src/org/eclipse/linuxtools/internal/cdt/libhover/devhelp/preferences/LibHoverPreferencePage.java @@ -34,8 +34,6 @@ import org.eclipse.linuxtools.internal.cdt.libhover.LibHoverLibrary; import org.eclipse.linuxtools.internal.cdt.libhover.devhelp.DevHelpPlugin; import org.eclipse.linuxtools.internal.cdt.libhover.devhelp.ParseDevHelp; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; @@ -128,13 +126,10 @@ public class LibHoverPreferencePage extends FieldEditorPreferencePage implements k.addJobChangeListener(new JobChangeAdapter() { @Override public void done(IJobChangeEvent event) { - Display.getDefault().syncExec(new Runnable() { - @Override - public void run() { - if (generateButton != null) - generateButton.setEnabled(true); - } - }); + Display.getDefault().syncExec(() -> { + if (generateButton != null) + generateButton.setEnabled(true); + }); } }); k.schedule(); @@ -152,12 +147,7 @@ public class LibHoverPreferencePage extends FieldEditorPreferencePage implements regenerate(); } }); - generateButton.addDisposeListener(new DisposeListener() { - @Override - public void widgetDisposed(DisposeEvent event) { - generateButton = null; - } - }); + generateButton.addDisposeListener(event -> generateButton = null); GridData gd = new GridData(); gd.horizontalAlignment = GridData.FILL; diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath index 098194ca4b..eca7bdba8f 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.classpath @@ -1,6 +1,6 @@ <?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.7"/> + <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="output" path="bin"/> diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs index 37db8e0cf9..7a2f00a40c 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 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 @@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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 diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF index c083339044..cec8b49b79 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF +++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/META-INF/MANIFEST.MF @@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.linuxtools.cdt.libhover.library.docs;bundle-version= org.eclipse.linuxtools.cdt.libhover;bundle-version="1.0.1", org.eclipse.core.filesystem;bundle-version="1.2.0", org.eclipse.core.runtime;bundle-version="3.4.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/.classpath b/libhover/org.eclipse.linuxtools.cdt.libhover/.classpath index 098194ca4b..eca7bdba8f 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover/.classpath +++ b/libhover/org.eclipse.linuxtools.cdt.libhover/.classpath @@ -1,6 +1,6 @@ <?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.7"/> + <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="output" path="bin"/> diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs b/libhover/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs index 35f2cf0756..a5ca9f0c6e 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs +++ b/libhover/org.eclipse.linuxtools.cdt.libhover/.settings/org.eclipse.jdt.core.prefs @@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable 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.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -106,4 +106,4 @@ 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 diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF b/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF index cc90faf15f..1798961fbb 100644 --- a/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF +++ b/libhover/org.eclipse.linuxtools.cdt.libhover/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.filesystem;bundle-version="1.2.0", org.eclipse.cdt.core;bundle-version="5.0.0", org.eclipse.jface.text;bundle-version="3.4.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.linuxtools.cdt.libhover, org.eclipse.linuxtools.internal.cdt.libhover;x-friends:="org.eclipse.linuxtools.cdt.libhover.devhelp,org.eclipse.linuxtools.cdt.libhover.devhelp.tests", org.eclipse.linuxtools.internal.cdt.libhover.preferences;x-friends:="org.eclipse.linuxtools.cdt.libhover.devhelp.tests" |