Changeset 674 for trunk

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

Location:

trunk

Files:

• java-utils-test/src/test/java/de/ugoe/cs/util/console/TextConsoleTest.java (modified) (3 diffs)
• java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java (modified) (5 diffs)
• quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java (modified) (3 diffs)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (modified) (4 diffs)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (modified) (3 diffs)

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/TextConsoleTest.java

@@ -71 +71 @@
         public void testTraceMsg_1() throws Exception {
                 TextConsole fixture = new TextConsole();
-                fixture.setDebug(true);
                 String traceMessage = "test";
                 Level traceLevel = Level.WARNING;
@@ -83 +82 @@
         @Test
         public void testTraceMsg_2() throws Exception {
-                TextConsole fixture = new TextConsole();
-                fixture.setDebug(true);
+                TextConsole fixture = new TextConsole(Level.INFO);
                 String traceMessage = "test";
                 Level traceLevel = Level.INFO;
@@ -96 +94 @@
                @Test
                 public void testTraceMsg_3() throws Exception {
-                        TextConsole fixture = new TextConsole();
-                        fixture.setDebug(false);
+                        TextConsole fixture = new TextConsole(Level.WARNING);
                         String traceMessage = "[INFO] test";
                         Level traceLevel = Level.INFO;

trunk/java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java

@@ -21 +21 @@
 public class TextConsole implements IOutputListener, IErrorListener,
                 ITraceListener, IExceptionListener {
-
+        
         /**
-         * <p>
-         * In the debug mode, trace messages will be printed.
-         * </p>
+         * <p>Defines the trace level used by this console.</p>
          */
-        private boolean debugMode = true;
+        private Level traceLevel;
+        
+        /**
+         * <p>
+         * Creates a new text console and automatically registers it as observer. The trace level is {@link Level#WARNING}.
+         * </p>
+         */
+        public TextConsole() {
+            this(Level.WARNING);
+        }
 
         /**
@@ -33 +40 @@
          * Creates a new text console and automatically registers it as observer.
          * </p>
+         * @param traceLevel trace level used by this text console
          */
-        public TextConsole() {
+        public TextConsole(Level traceLevel) {
                 Console.getInstance().registerOutputListener(this);
                 Console.getInstance().registerErrorListener(this);
                 Console.getInstance().registerTraceListener(this);
                 Console.getInstance().registerExceptionListener(this);
+                this.traceLevel = traceLevel;
         }
 
@@ -84 +93 @@
         @Override
         public void traceMsg(String traceMessage, Level level) {
-                if (debugMode) {
+                if (level.intValue()>=traceLevel.intValue()) {
                         System.out.print("[" + level.toString() + "] " + traceMessage);
                 }
@@ -95 +104 @@
          * {@code stdin}.
          * </p>
-         * 
-         * @param debugMode
-         *            true, if the application is to run in debug mode, i.e. trace
-         *            messages will be printed
          */
-        public void run(boolean debugMode) {
-                this.debugMode = debugMode;
+        public void run() {
                 CommandExecuter exec = CommandExecuter.getInstance();
                 while (true) {
@@ -136 +140 @@
         }
 
-        /**
-         * <p>
-         * Configures if the debug mode of the text console is enabled.
-         * </p>
-         * 
-         * @param debug
-         *            if true, debug mode is enabled.
-         */
-        public void setDebug(boolean debug) {
-                debugMode = debug;
-        }
-
 }

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;

trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java

@@ -2 +2 @@
 
 import java.util.List;
+import java.util.logging.Level;
 
 import org.eclipse.swt.widgets.Display;
@@ -29 +30 @@
 
     private List<String> startupCommands;
+    
+    private final Level traceLevel;
 
     protected Shell shlEventbenchConsole;
@@ -45 +48 @@
     protected CommandHistoryDialog historyDialog;
 
-    public MainWindow(List<String> startupCommands) {
+    public MainWindow(List<String> startupCommands, Level traceLevel) {
         this.startupCommands = startupCommands;
+        this.traceLevel = traceLevel;
     }
 
@@ -59 +63 @@
         Display display = Display.getDefault();
         createContents();
-        new SWTConsole(consoleTabComposite.textConsoleOutput);
+        new SWTConsole(consoleTabComposite.textConsoleOutput, traceLevel);
         historyDialog = new CommandHistoryDialog(shlEventbenchConsole, SWT.NONE);
         shlEventbenchConsole.open();

trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java

@@ -18 +18 @@
 {
 
-    StyledText output;
+    private StyledText output;
+    
+    private Level traceLevel;
 
-    public SWTConsole(StyledText styledText) {
+    public SWTConsole(StyledText styledText, Level traceLevel) {
         Console.getInstance().registerOutputListener(this);
         Console.getInstance().registerErrorListener(this);
@@ -26 +28 @@
         Console.getInstance().registerCommandListener(this);
         this.output = styledText;
+        this.traceLevel = traceLevel;
     }
 
@@ -40 +43 @@
     @Override
     public void traceMsg(String traceMessage, Level level) {
-        appendColored("[" + level.toString() + "] " + traceMessage, SWT.COLOR_BLUE);
+        if( level.intValue()>=traceLevel.intValue()) {
+            appendColored("[" + level.toString() + "] " + traceMessage, SWT.COLOR_BLUE);
+        }
     }