Changeset 247

Timestamp:

10/06/11 18:06:22 (13 years ago)

Author:

sherbold

Message:

• improved command line parsing by using JOpt Simple API

Location:

trunk

Files:

• EventBenchConsole/.classpath (modified) (1 diff)
• EventBenchConsole/src/de/ugoe/cs/eventbench/Runner.java (modified) (3 diffs)
• EventBenchConsole/src/de/ugoe/cs/eventbench/swt/MainWindow.java (modified) (4 diffs)
• JavaCommons/build.xml (modified) (1 diff)
• JavaCommons/lib/jopt-simple-3.3.jar (added)

trunk/EventBenchConsole/.classpath

@@ -33 +33 @@
         <classpathentry kind="lib" path="/Build/lib/vecmath-1.3.1.jar"/>
         <classpathentry kind="lib" path="/Build/lib/wstx-asl-3.2.6.jar"/>
+        <classpathentry kind="lib" path="/Build/lib/jopt-simple-3.3.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/Runner.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench;
 
+import java.io.IOException;
+import java.util.List;
+
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
 import de.ugoe.cs.eventbench.log4j.Log4JLogger;
 import de.ugoe.cs.eventbench.swt.MainWindow;
@@ -19 +26 @@
  */
 public class Runner {
+
+        public enum UITYPE {
+                text, swt
+        };
 
         /**
@@ -39 +50 @@
                 CommandExecuter.getInstance().addCommandPackage(
                                 "de.ugoe.cs.eventbench.efg.commands");
-                TextConsole textConsole = new TextConsole();
                 new Log4JLogger();
-                boolean swtGuiRunning = false;
-                if (args.length >= 1) {
-                        if( args[0].equals("-swt") ) {
-                                MainWindow mainWindow = new MainWindow();
-                                mainWindow.open();
-                                swtGuiRunning = true;
-                        } else {
-                                for (String command : args) {
-                                        CommandExecuter.getInstance().exec(command);
-                                }
+
+                OptionParser parser = new OptionParser();
+                OptionSpec<UITYPE> ui = parser.accepts("ui", "Allowed values: text, swt").withRequiredArg()
+                                .ofType(UITYPE.class).defaultsTo(UITYPE.text);
+                OptionSet options = parser.parse(args);
+
+                List<String> startupCommands = options.nonOptionArguments();
+                try {
+                switch (options.valueOf(ui)) {
+                case text:
+                        TextConsole textConsole = new TextConsole();
+                        for (String command : startupCommands) {
+                                CommandExecuter.getInstance().exec(command);
                         }
+                        textConsole.run(true);
+                        break;
+                case swt:
+                        MainWindow mainWindow = new MainWindow(startupCommands);
+                        mainWindow.open();
+                        break;
                 }
-                if( !swtGuiRunning ) {
-                        textConsole.run(true);
+                } catch (OptionException e) {
+                        System.err.println("Invalid Parameters: " + e.getMessage());
+                        try {
+                                parser.printHelpOn(System.out);
+                        } catch (IOException e1) {
+                                // ignore exception.
+                        }
                 }
         }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/MainWindow.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.swt;
+
+import java.util.List;
 
 import org.eclipse.swt.widgets.Display;
@@ -25 +27 @@
  */
 public class MainWindow {
+        
+        private List<String> startupCommands;
 
         protected Shell shlEventbenchConsole;
@@ -39 +43 @@
         protected CommandHistoryDialog historyDialog;
 
+        public MainWindow(List<String> startupCommands) {
+                this.startupCommands = startupCommands;
+        }
+        
         /**
          * <p>
@@ -53 +61 @@
                 shlEventbenchConsole.open();
                 shlEventbenchConsole.layout();
+                for(String command : startupCommands ) {
+                        CommandExecuter.getInstance().exec(command);
+                }
                 while (!shlEventbenchConsole.isDisposed()) {
                         if (!display.readAndDispatch()) {

trunk/JavaCommons/build.xml

@@ -73 +73 @@
                 <pathelement location="lib/gui-model-core.jar" />
                 <pathelement location="lib/log4j-1.2.16.jar" />
+                <pathelement location="lib/jopt-simple-3.3.jar" />
                 <path refid="JavaHelperLib.classpath" />
                 <path refid="EventBenchCore.classpath" />