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

nongui command arguments

Browse source
This commit is contained in:
fros4943 2007-05-28 08:06:41 +00:00
parent 9d18cd5609
commit 6271beabc3
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: GUI.java,v 1.51 2007/05/24 08:24:11 fros4943 Exp $ * $Id: GUI.java,v 1.52 2007/05/28 08:06:41 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -2592,12 +2592,24 @@ public class GUI {
DOMConfigurator.configure(GUI.class.getResource("/" + LOG_CONFIG_FILE)); DOMConfigurator.configure(GUI.class.getResource("/" + LOG_CONFIG_FILE));
} }
// Check for Contiki path argument // Parse general command arguments
for (int i = 1; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-contiki=")) { if (args[i].startsWith("-contiki=")) {
String arg = args[i].substring("-contiki=".length()); String arg = args[i].substring("-contiki=".length());
GUI.specifiedContikiPath = arg; GUI.specifiedContikiPath = arg;
} }
if (args[i].startsWith("-external_tools_config=")) {
String arg = args[i].substring("-external_tools_config=".length());
File specifiedExternalToolsConfigFile = new File(arg);
if (!specifiedExternalToolsConfigFile.exists()) {
logger.fatal("Specified external tools configuration not found: " + specifiedExternalToolsConfigFile);
specifiedExternalToolsConfigFile = null;
System.exit(1);
} else {
GUI.externalToolsUserSettingsFile = specifiedExternalToolsConfigFile;
}
}
} }
// Check if simulator should be quick-started // Check if simulator should be quick-started
@ -2685,23 +2697,6 @@ public class GUI {
System.exit(1); System.exit(1);
} else if (args.length > 0 && args[0].startsWith("-nogui")) { } else if (args.length > 0 && args[0].startsWith("-nogui")) {
// Parse arguments
for (int i = 1; i < args.length; i++) {
if (args[i].startsWith("-external_tools_config=")) {
String arg = args[i].substring("-external_tools_config=".length());
File specifiedExternalToolsConfigFile = new File(arg);
if (!specifiedExternalToolsConfigFile.exists()) {
logger.fatal("Specified external tools configuration not found: " + specifiedExternalToolsConfigFile);
specifiedExternalToolsConfigFile = null;
System.exit(1);
} else {
GUI.externalToolsUserSettingsFile = specifiedExternalToolsConfigFile;
}
}
}
// No GUI start-up // No GUI start-up
javax.swing.SwingUtilities.invokeLater(new Runnable() { javax.swing.SwingUtilities.invokeLater(new Runnable() {