From f0c562a2c6e020b88f9adc61cd3038f4b44101db Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Sun, 22 Mar 2009 14:05:19 +0000
Subject: [PATCH] minor bugfixes: support relative paths when saving simulation
 configs + check that simulation load succeeded

---
 .../java/se/sics/cooja/plugins/ScriptRunner.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
index d59fb917f..6834f33be 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunner.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ScriptRunner.java,v 1.15 2009/03/03 15:24:18 fros4943 Exp $
+ * $Id: ScriptRunner.java,v 1.16 2009/03/22 14:05:19 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -323,9 +323,10 @@ public class ScriptRunner implements Plugin {
         logTextArea.setText("");
 
         gui.doLoadConfig(false, true, proposedDir);
-        Vector<File> history = gui.getFileHistory();
-
-        File cscFile = history.firstElement();
+        if (gui.getSimulation() == null) {
+          return;
+        }
+        File cscFile = gui.currentConfigFile;
         String testName = cscFile.getName().substring(0, cscFile.getName().length()-4);
         File testDir = cscFile.getParentFile();
         File jsFile = new File(testDir, testName + ".js");
@@ -458,6 +459,7 @@ public class ScriptRunner implements Plugin {
     }
 
     /* Get current simulation configuration */
+    simulation.getGUI().currentConfigFile = cscFile;
     Element root = new Element("simconf");
     Element simulationElement = new Element("simulation");
     simulationElement.addContent(simulation.getConfigXML());
@@ -613,7 +615,7 @@ public class ScriptRunner implements Plugin {
               if (line == null) {
                 line = "";
               }
-              testOutput.addMessage("", MessageList.NORMAL);
+              testOutput.addMessage(line, MessageList.NORMAL);
               if (line.contains("TEST OK")) {
                 testSucceeded = true;
                break;