Move o.e.dltk.ruby.launching to Java 1.6.
* Bump BREE.
* Fix new warnings.
Change-Id: I91b07a9426f9cde2f11f919fbb3536441b4d99a8
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.launching/.classpath b/plugins/org.eclipse.dltk.ruby.launching/.classpath
index 64c5e31..ad32c83 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/.classpath
+++ b/plugins/org.eclipse.dltk.ruby.launching/.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/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.dltk.ruby.launching/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.ruby.launching/.settings/org.eclipse.jdt.core.prefs
index c9971b8..c537b63 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.ruby.launching/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Sun Apr 04 22:01:53 NOVST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
index eb0233c..b15ad27 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.ruby.launching/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@
Eclipse-LazyStart: true
Export-Package: org.eclipse.dltk.ruby.internal.launching,
org.eclipse.dltk.ruby.launching
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/JRubyInstallType.java b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/JRubyInstallType.java
index 3947374..0f9b3d1 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/JRubyInstallType.java
+++ b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/JRubyInstallType.java
@@ -15,10 +15,12 @@
private static final String[] INTERPRETER_NAMES = { "jruby" }; //$NON-NLS-1$
+ @Override
public String getNatureId() {
return RubyNature.NATURE_ID;
}
+ @Override
public String getName() {
return INSTALL_TYPE_NAME;
}
diff --git a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstall.java b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstall.java
index 8177714..c0d9d4a 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstall.java
+++ b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstall.java
@@ -71,6 +71,7 @@
.toOSString(), config);
Thread readerThread = new Thread(new Runnable() {
+ @Override
public void run() {
BufferedReader input = null;
try {
diff --git a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstallType.java b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstallType.java
index 38a8756..5ef171b 100644
--- a/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstallType.java
+++ b/plugins/org.eclipse.dltk.ruby.launching/src/org/eclipse/dltk/ruby/internal/launching/RubyGenericInstallType.java
@@ -33,10 +33,12 @@
private static final String[] INTERPRETER_NAMES = {
"ruby", "rubyw", "ruby18", "ruby19" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ @Override
public String getNatureId() {
return RubyNature.NATURE_ID;
}
+ @Override
public String getName() {
return INSTALL_TYPE_NAME;
}
