Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2017-11-14 10:09:32 -0500
committerAlexander Kurtakov2017-11-14 10:09:32 -0500
commitf0ccbf59758671da27b3d75cd7775d4d69b76dfb (patch)
treecb84401989315cd6cce1ad77a0ad62c767e209e2
parent1a60d4bbf10c52fca4f7f6d07929639cdcb4ee01 (diff)
downloadrt.equinox.bundles-I20171115-0115.tar.gz
rt.equinox.bundles-I20171115-0115.tar.xz
rt.equinox.bundles-I20171115-0115.zip
Bug 527146 - Move equinox.console to Java 7I20171115-0115I20171115-0025I20171114-2000
Revert equinox.console to Java 1.7 to keep it working with framework on 1.7. Change-Id: If2ef609212608e0dae81b181c2c66da40e3a52a8 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rwxr-xr-xbundles/org.eclipse.equinox.console/.classpath2
-rwxr-xr-xbundles/org.eclipse.equinox.console/.settings/org.eclipse.jdt.core.prefs6
-rwxr-xr-xbundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF2
-rwxr-xr-xbundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java29
4 files changed, 21 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.console/.classpath b/bundles/org.eclipse.equinox.console/.classpath
index eca7bdba..098194ca 100755
--- a/bundles/org.eclipse.equinox.console/.classpath
+++ b/bundles/org.eclipse.equinox.console/.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.8"/>
+ <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.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.equinox.console/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.console/.settings/org.eclipse.jdt.core.prefs
index 0cc2336f..8f194e2d 100755
--- a/bundles/org.eclipse.equinox.console/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.console/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ 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.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -107,4 +107,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.8
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
index 2b47ed47..6f432216 100755
--- a/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.3.0.qualifier
Bundle-Activator: org.eclipse.equinox.console.command.adapter.Activator
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.osgi.framework.console,
org.eclipse.osgi.report.resolution; version="[1.0,2.0)",
org.eclipse.osgi.service.environment,
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
index 09c7d851..a5843736 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
@@ -127,19 +127,22 @@ public class Activator implements BundleActivator {
return null;
PrintStream output = new PrintStream(equinoxSession.getOutput());
final CommandSession gogoSession = processor.createSession(equinoxSession.getInput(), output, output);
- new Thread((Runnable) () -> {
- try {
- gogoSession.put("SCOPE", "equinox:*");
- gogoSession.put("prompt", "osgi> ");
- gogoSession.execute("gosh --login --noshutdown");
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- gogoSession.close();
- equinoxSession.close();
- }
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ gogoSession.put("SCOPE", "equinox:*");
+ gogoSession.put("prompt", "osgi> ");
+ gogoSession.execute("gosh --login --noshutdown");
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally {
+ gogoSession.close();
+ equinoxSession.close();
+ }
+ }
}, "Equinox Console Session").start();
return null;
}

Back to the top