Changeset 674 for trunk/quest-runner/src/main/java/de/ugoe

Timestamp:

08/28/12 16:42:22 (12 years ago)

Author:

sherbold

Message:

• modified startup-parameter trace of runner from binary into java.util.Logger.Level to define the tracing granularity; defaults to WARNING)
• modified TextConsole? and SWTConsole to trace according to trace-parameter

File:

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

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

@@ -5 +5 @@
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
 
 import joptsimple.OptionException;
@@ -70 +71 @@
             parser.accepts("ui", "Allowed values: text, swt").withRequiredArg()
                 .ofType(UITYPE.class).defaultsTo(UITYPE.text);
-        OptionSpec<LOG4JTYPE> trace =
-            parser.accepts("trace", "Allowed values: enable, disable").withRequiredArg()
-                .ofType(LOG4JTYPE.class).defaultsTo(LOG4JTYPE.enable);
+        OptionSpec<Level> trace =
+            parser.accepts("trace", "Allowed values: OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL").withRequiredArg()
+                .ofType(Level.class).defaultsTo(Level.WARNING);
         OptionSet options = parser.parse(args);
 
@@ -92 +93 @@
             {
                 case text:
-                    TextConsole textConsole = new TextConsole();
-                    if (options.valueOf(trace) == LOG4JTYPE.disable) {
-                        textConsole.setDebug(false);
-                    }
+                    TextConsole textConsole = new TextConsole(options.valueOf(trace));
                     for (String command : startupCommands) {
                         CommandExecuter.getInstance().exec(command);
                     }
-                    textConsole.run(true);
+                    textConsole.run();
                     break;
                 case swt:
-                    MainWindow mainWindow = new MainWindow(startupCommands);
+                    MainWindow mainWindow = new MainWindow(startupCommands, options.valueOf(trace));
                     mainWindow.open();
                     break;