Changeset 677 for trunk

Timestamp:

08/28/12 17:07:24 (12 years ago)

Author:

sherbold

Message:

• fixed problem with new startup-parameters

File:

• trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java (modified) (4 diffs)

trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java

@@ -35 +35 @@
         text, swt
     };
+    
+    public enum LEVELENUM {
+        OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL;
+        
+        public Level getLevel() {
+            switch (this)
+            {
+                case OFF:
+                    return Level.OFF;
+                case SEVERE:
+                    return Level.SEVERE;
+                case ALL:
+                    return Level.ALL;
+                case CONFIG:
+                    return Level.CONFIG;
+                case FINE:
+                    return Level.FINE;
+                case FINER:
+                    return Level.FINER;
+                case FINEST:
+                    return Level.FINEST;
+                case INFO:
+                    return Level.INFO;
+                case WARNING:
+                    return Level.WARNING;
+                default:
+                    throw new AssertionError("reached source code that should be unreachable");
+            }
+        }
+    }
 
     /**
@@ -61 +91 @@
 
         OptionParser parser = new OptionParser();
-        OptionSpec<Level> log4j =
+        OptionSpec<LEVELENUM> log4j =
             parser.accepts("log4j", "Allowed values: OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL").withRequiredArg()
-                .ofType(Level.class).defaultsTo(Level.INFO);
+                .ofType(LEVELENUM.class).defaultsTo(LEVELENUM.INFO);
         OptionSpec<UITYPE> ui =
             parser.accepts("ui", "Allowed values: text, swt").withRequiredArg()
                 .ofType(UITYPE.class).defaultsTo(UITYPE.text);
-        OptionSpec<Level> trace =
+        OptionSpec<LEVELENUM> trace =
             parser.accepts("trace", "Allowed values: OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL").withRequiredArg()
-                .ofType(Level.class).defaultsTo(Level.WARNING);
+                .ofType(LEVELENUM.class).defaultsTo(LEVELENUM.WARNING);
         OptionSet options = parser.parse(args);
 
         List<String> startupCommands = options.nonOptionArguments();
         try {
-            if(options.valueOf(log4j)!=Level.OFF) {
-                new Log4JLogger(options.valueOf(log4j));
+            if(options.valueOf(log4j)!=LEVELENUM.OFF) {
+                new Log4JLogger(options.valueOf(log4j).getLevel());
             }
 
@@ -81 +111 @@
             {
                 case text:
-                    TextConsole textConsole = new TextConsole(options.valueOf(trace));
+                    TextConsole textConsole = new TextConsole(options.valueOf(trace).getLevel());
                     for (String command : startupCommands) {
                         CommandExecuter.getInstance().exec(command);
@@ -88 +118 @@
                     break;
                 case swt:
-                    MainWindow mainWindow = new MainWindow(startupCommands, options.valueOf(trace));
+                    MainWindow mainWindow = new MainWindow(startupCommands, options.valueOf(trace).getLevel());
                     mainWindow.open();
                     break;