From 6d61893e0995f57358a938459ef8922ac8eddc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20L=C3=B6scher?= Date: Fri, 7 Nov 2014 13:53:16 +0100 Subject: [PATCH] Fixed a bug with the ScriptRunner plugin The ScriptRunner plugin started the simulation in GUI and NOGUI mode. Now the simulation is only started in nogui mode --- tools/cooja/java/org/contikios/cooja/Cooja.java | 2 +- .../org/contikios/cooja/plugins/ScriptRunner.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/cooja/java/org/contikios/cooja/Cooja.java b/tools/cooja/java/org/contikios/cooja/Cooja.java index 34ff20195..c131e3e22 100644 --- a/tools/cooja/java/org/contikios/cooja/Cooja.java +++ b/tools/cooja/java/org/contikios/cooja/Cooja.java @@ -1023,7 +1023,7 @@ public class Cooja extends Observable { int pluginType = pluginClass.getAnnotation(PluginType.class).value(); if (pluginType != PluginType.SIM_PLUGIN && pluginType != PluginType.SIM_STANDARD_PLUGIN - && pluginType == PluginType.SIM_CONTROL_PLUGIN) { + && pluginType != PluginType.SIM_CONTROL_PLUGIN) { continue; } diff --git a/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java b/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java index 4e3be7297..bce5764e6 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java @@ -274,10 +274,14 @@ public class ScriptRunner extends VisPlugin { if (script != null) { updateScript(script); } - - /* start simulation */ - simulation.setSpeedLimit(null); - simulation.startSimulation(); + } + + public void startPlugin() { + /* start simulation */ + if (!Cooja.isVisualized()) { + simulation.setSpeedLimit(null); + simulation.startSimulation(); + } } public void setLinkFile(File source) {