deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

show dialog at script errors

Browse source
This commit is contained in:
fros4943 2009-06-03 17:26:31 +00:00
parent 0946203c57
commit 7ada9705a4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: LogScriptEngine.java,v 1.12 2009/05/20 14:11:21 fros4943 Exp $ * $Id: LogScriptEngine.java,v 1.13 2009/06/03 17:26:31 fros4943 Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -235,13 +235,13 @@ public class LogScriptEngine {
scriptActive = false; scriptActive = false;
if (semaphoreScript == null) { if (semaphoreScript == null) {
logger.warn("semaphoreScript is not initialized"); /*logger.warn("semaphoreScript is not initialized");*/
} }
if (semaphoreSim == null) { if (semaphoreSim == null) {
logger.warn("semaphoreSim is not initialized"); /*logger.warn("semaphoreSim is not initialized");*/
} }
if (scriptThread == null) { if (scriptThread == null) {
logger.warn("scriptThread is not initialized"); /*logger.warn("scriptThread is not initialized");*/
} }
if (timeoutEvent != null) { if (timeoutEvent != null) {
@ -369,6 +369,10 @@ public class LogScriptEngine {
logger.fatal("Script error:", e); logger.fatal("Script error:", e);
deactivateScript(); deactivateScript();
gui.getSimulation().stopSimulation(); gui.getSimulation().stopSimulation();
if (GUI.isVisualized()) {
GUI.showErrorDialog(GUI.getTopParentContainer(),
"Script error", e, false);
}
} }
} }
/*logger.info("test script thread exits");*/ /*logger.info("test script thread exits");*/