Changeset 396 for trunk/EventBenchConsole/src/de/ugoe/cs

Timestamp:

03/08/12 10:10:42 (13 years ago)

Author:

sherbold

Message:

• added application parameter log4j with possible values enable/disable (default: enable) that determines if a log4j logger is active during the execution

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/Runner.java (modified) (3 diffs)

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

@@ -30 +30 @@
                 text, swt
         };
+        
+        public enum LOG4JTYPE {
+                enable, disable
+        }
 
         /**
@@ -52 +56 @@
                 CommandExecuter.getInstance().addCommandPackage(
                                 "de.ugoe.cs.eventbench.jfc.commands");
-                new Log4JLogger();
+                //new Log4JLogger();
 
                 OptionParser parser = new OptionParser();
+                OptionSpec<LOG4JTYPE> log4j = parser.accepts("log4j", "Allowed values: enable, disable").withRequiredArg()
+                                .ofType(LOG4JTYPE.class).defaultsTo(LOG4JTYPE.enable);
                 OptionSpec<UITYPE> ui = parser.accepts("ui", "Allowed values: text, swt").withRequiredArg()
                                 .ofType(UITYPE.class).defaultsTo(UITYPE.text);
@@ -61 +67 @@
                 List<String> startupCommands = options.nonOptionArguments();
                 try {
-                switch (options.valueOf(ui)) {
-                case text:
-                        TextConsole textConsole = new TextConsole();
-                        for (String command : startupCommands) {
-                                CommandExecuter.getInstance().exec(command);
+                        switch (options.valueOf(log4j)) {
+                        case enable:
+                                new Log4JLogger();
+                                break;
+                        case disable:
+                                // do nothing
+                                break;
+                        default:
+                                throw new AssertionError("reached source code that should be unreachable impossible");
                         }
-                        textConsole.run(true);
-                        break;
-                case swt:
-                        MainWindow mainWindow = new MainWindow(startupCommands);
-                        mainWindow.open();
-                        break;
-                }
+                        
+                        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;
+                        default:
+                                throw new AssertionError("reached source code that should be unreachable impossible");
+                        }
                 } catch (OptionException e) {
                         System.err.println("Invalid Parameters: " + e.getMessage());