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

Merge pull request #663 from jdede/fix-cooja-export

Browse source 
Fix exported simulation: add jsyntaxpane JAR, start simulation
This commit is contained in:
Fredrik Österlind 2014-04-27 10:13:10 +02:00
parent 2ab6355415 823abf9d94
commit e35575f81e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/cooja/java/org/contikios/cooja/util/ExecuteJAR.java
View file

@ -187,7 +187,15 @@ public class ExecuteJAR {
logger.info("Starting simulation"); logger.info("Starting simulation");
Cooja.setLookAndFeel(); Cooja.setLookAndFeel();
Cooja.quickStartSimulationConfig(new File(executeDir, SIMCONFIG_FILENAME), false, null); Simulation sim = Cooja.quickStartSimulationConfig(new File(executeDir, SIMCONFIG_FILENAME), false, null);
if (sim != null){
/* Set simulation speed to maximum and start simulation */
sim.setSpeedLimit(null);
sim.startSimulation();
} else {
logger.fatal("Cannot load simulation, aborting");
System.exit(1);
}
} }
/** /**
@ -284,7 +292,8 @@ public class ExecuteJAR {
/* Unpacking COOJA core JARs */ /* Unpacking COOJA core JARs */
String[] coreJARs = new String[] { String[] coreJARs = new String[] {
"tools/cooja/lib/jdom.jar", "tools/cooja/lib/log4j.jar", "tools/cooja/dist/cooja.jar" "tools/cooja/lib/jdom.jar", "tools/cooja/lib/log4j.jar",
"tools/cooja/dist/cooja.jar", "tools/cooja/lib/jsyntaxpane.jar"
}; };
for (String jar: coreJARs) { for (String jar: coreJARs) {
File jarFile = new File(Cooja.getExternalToolsSetting("PATH_CONTIKI"), jar); File jarFile = new File(Cooja.getExternalToolsSetting("PATH_CONTIKI"), jar);