Revert to Java 5 compatibility

git-svn-id: https://svn.argeo.org/slc/trunk@1569 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/.classpath b/eclipse/plugins/org.argeo.slc.ui.launch/.classpath
index 9aad730cf7fa2a3f57d8585de96f342459e84ec2..b4e58ac5fecb319e3d93b81ac799f5ff181c9604 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.launch/.classpath
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/main/java"/>
+       <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/J2SE-1.5"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.argeo.slc.ui.launch/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..05eb256
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Fri Aug 29 11:26:23 CEST 2008
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/script/SlcScriptLaunchDelegate.java b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/script/SlcScriptLaunchDelegate.java
index 28f9671c14155da78bb1aabcfc0ca3ce1d49d8cf..4747cdb807701e828086971a86d35dc45e28cafa 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/script/SlcScriptLaunchDelegate.java
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/script/SlcScriptLaunchDelegate.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.ui.launch.script;\r
 \r
+import java.io.ByteArrayInputStream;\r
 import java.io.IOException;\r
 import java.io.StringReader;\r
 import java.util.List;\r
@@ -181,15 +182,20 @@ public class SlcScriptLaunchDelegate extends
 \r
                // Properties\r
                Properties properties = new Properties();\r
-               StringReader reader = new StringReader(configuration.getAttribute(\r
-                               SlcScriptUtils.ATTR_PROPERTIES, ""));\r
+               String str = configuration.getAttribute(SlcScriptUtils.ATTR_PROPERTIES,\r
+                               "");\r
+               ByteArrayInputStream in = new ByteArrayInputStream(str.getBytes());\r
                try {\r
-                       properties.load(reader);\r
+                       properties.load(in);\r
                } catch (IOException e) {\r
                        throw new RuntimeException("Cannot read properties", e);\r
                } finally {\r
-                       if (reader != null)\r
-                               reader.close();\r
+                       if (in != null)\r
+                               try {\r
+                                       in.close();\r
+                               } catch (IOException e) {\r
+                                       // silent\r
+                               }\r
                }\r
 \r
                for (Object key : properties.keySet()) {\r