X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.ui.launch%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fui%2Flaunch%2Fscript%2FSlcScriptLaunchDelegate.java;h=3fb6e3c97c49a3d81b7e58f955ec72221fd9ad90;hb=7608332865a01c65a10424e5580a287ff4eb17a7;hp=28f9671c14155da78bb1aabcfc0ca3ce1d49d8cf;hpb=f7b4fb58ca4d58d6b65ca071a41994fc88195828;p=gpl%2Fargeo-slc.git

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 28f9671c1..3fb6e3c97 100644
--- 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,7 +1,7 @@
 package org.argeo.slc.ui.launch.script;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
@@ -10,7 +10,7 @@ import org.argeo.slc.ui.launch.DeployedSlcSystem;
 import org.argeo.slc.ui.launch.EmbeddedSlcSystem;
 import org.argeo.slc.ui.launch.SlcSystem;
 import org.argeo.slc.ui.launch.SlcUiLaunchPlugin;
-import org.argeo.slc.ui.launch.preferences.SlcPreferencePage;
+import org.argeo.slc.ui.launch.preferences.SlcLaunchPreferencePage;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -43,6 +43,7 @@ public class SlcScriptLaunchDelegate extends
 	public final static String ANT_MAIN = "org.apache.tools.ant.Main";
 	public final static String SLC_MAIN = "org.argeo.slc.cli.SlcMain";
 
+	@SuppressWarnings("deprecation")
 	public void launch(ILaunchConfiguration configuration, String mode,
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
 		if (!saveBeforeLaunch(configuration, mode, monitor))
@@ -100,7 +101,7 @@ public class SlcScriptLaunchDelegate extends
 		if (slcSystem == null) {
 			String slcRuntimePath = SlcUiLaunchPlugin.getDefault()
 					.getPreferenceStore().getString(
-							SlcPreferencePage.PREF_SLC_RUNTIME_LOCATION);
+							SlcLaunchPreferencePage.PREF_SLC_RUNTIME_LOCATION);
 			if (slcRuntimePath == null || slcRuntimePath.equals("")) {
 				showError("SLC Runtime path is not set. Set it in Windows > Preferences > SLC");
 				return null;
@@ -181,15 +182,20 @@ public class SlcScriptLaunchDelegate extends
 
 		// Properties
 		Properties properties = new Properties();
-		StringReader reader = new StringReader(configuration.getAttribute(
-				SlcScriptUtils.ATTR_PROPERTIES, ""));
+		String str = configuration.getAttribute(SlcScriptUtils.ATTR_PROPERTIES,
+				"");
+		ByteArrayInputStream in = new ByteArrayInputStream(str.getBytes());
 		try {
-			properties.load(reader);
+			properties.load(in);
 		} catch (IOException e) {
 			throw new RuntimeException("Cannot read properties", e);
 		} finally {
-			if (reader != null)
-				reader.close();
+			if (in != null)
+				try {
+					in.close();
+				} catch (IOException e) {
+					// silent
+				}
 		}
 
 		for (Object key : properties.keySet()) {