Improve ergonomics

[gpl/argeo-slc.git] / eclipse / plugins / org.argeo.slc.ui.launch / src / main / java / org / argeo / slc / ui / launch / script / SlcScriptLaunchDelegate.java

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 a6569b911a582176720ed236dee97115a22f8226..dfd956177dfce70cc8ecae8e9017be16733b6b4f 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
@@ -13,11 +13,15 @@ import org.argeo.slc.ui.launch.SlcUiLaunchPlugin;
 import org.argeo.slc.ui.launch.preferences.SlcPreferencePage;\r
 import org.eclipse.core.resources.IFile;\r
 import org.eclipse.core.resources.IProject;\r
-import org.eclipse.core.resources.IResource;\r
+import org.eclipse.core.resources.ResourcesPlugin;\r
 import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.core.runtime.IPath;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Path;\r
 import org.eclipse.core.runtime.Status;\r
+import org.eclipse.core.variables.IStringVariableManager;\r
+import org.eclipse.core.variables.VariablesPlugin;\r
 import org.eclipse.debug.core.ILaunch;\r
 import org.eclipse.debug.core.ILaunchConfiguration;\r
 import org.eclipse.debug.core.ILaunchManager;\r
@@ -35,29 +39,37 @@ public class SlcScriptLaunchDelegate extends
                AbstractJavaLaunchConfigurationDelegate {\r
        public static final String ID = "org.argeo.slc.launch.slcScriptLaunchType";\r
 \r
-       public final static String ATTR_SCRIPT = "script";\r
-       public final static String ATTR_PROPERTIES = "properties";\r
-       public final static String ATTR_RUNTIME = "runtime";\r
-       public final static String ATTR_TARGETS = "targets";\r
-       public final static String ATTR_PRE093 = "pre093";\r
-\r
        public final static String ANT_MAIN = "org.apache.tools.ant.Main";\r
        public final static String SLC_MAIN = "org.argeo.slc.cli.SlcMain";\r
 \r
        public void launch(ILaunchConfiguration configuration, String mode,\r
                        ILaunch launch, IProgressMonitor monitor) throws CoreException {\r
-               IResource[] resources = configuration.getMappedResources();\r
+               if (!saveBeforeLaunch(configuration, mode, monitor))\r
+                       return;\r
 \r
-               if (resources.length != 1) {\r
-                       throw new RuntimeException("Can only launch one script.");\r
-               }\r
-               if (!(resources[0] instanceof IFile)) {\r
-                       throw new RuntimeException("Can only launch file.");\r
-               }\r
-               IFile file = (IFile) resources[0];\r
-               System.out.println("Launched " + file.getLocation().toFile());\r
+               String scriptLocation = configuration.getAttribute(\r
+                               SlcScriptUtils.ATTR_SCRIPT, "");\r
+               if (scriptLocation.equals(""))\r
+                       abort("Script has to be provided", null, 1);\r
+\r
+               IStringVariableManager manager = VariablesPlugin.getDefault()\r
+                               .getStringVariableManager();\r
+               scriptLocation = manager.performStringSubstitution(scriptLocation);\r
+               System.out.println("Script location " + scriptLocation);\r
+\r
+               IPath path = new Path(scriptLocation);\r
+               System.out.println("Script path " + path);\r
+               IFile[] files = ResourcesPlugin.getWorkspace().getRoot()\r
+                               .findFilesForLocation(path);\r
+\r
+               if (files.length == 0)\r
+                       abort("Coulkd not find related file", null, 1);\r
+\r
+               IFile file = (IFile) files[0];\r
+               System.out.println("Launching " + file.getLocation().toFile());\r
 \r
-               boolean pre093 = configuration.getAttribute(ATTR_PRE093, false);\r
+               boolean pre093 = configuration.getAttribute(SlcScriptUtils.ATTR_PRE093,\r
+                               false);\r
 \r
                // Retrieve SLC Runtime\r
                SlcSystem slcSystem = findSlcSystem(file, pre093);\r
@@ -153,14 +165,16 @@ public class SlcScriptLaunchDelegate extends
                list.add(file.getLocation().toFile().getAbsolutePath());\r
 \r
                // Runtime\r
-               String runtime = configuration.getAttribute(ATTR_RUNTIME, "");\r
+               String runtime = configuration.getAttribute(\r
+                               SlcScriptUtils.ATTR_RUNTIME, "");\r
                if (!runtime.equals("")) {\r
                        list.add("--runtime");\r
                        list.add(runtime);\r
                }\r
 \r
                // Targets\r
-               String targets = configuration.getAttribute(ATTR_RUNTIME, "");\r
+               String targets = configuration.getAttribute(\r
+                               SlcScriptUtils.ATTR_TARGETS, "");\r
                if (!runtime.equals("")) {\r
                        list.add("--targets");\r
                        list.add(targets);\r
@@ -169,7 +183,7 @@ public class SlcScriptLaunchDelegate extends
                // Properties\r
                Properties properties = new Properties();\r
                StringReader reader = new StringReader(configuration.getAttribute(\r
-                               ATTR_PROPERTIES, ""));\r
+                               SlcScriptUtils.ATTR_PROPERTIES, ""));\r
                try {\r
                        properties.load(reader);\r
                } catch (IOException e) {\r