Index: /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/TextConsoleTest.java
===================================================================
--- /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/TextConsoleTest.java (revision 673)
+++ /trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/TextConsoleTest.java (revision 674)
@@ -71,5 +71,4 @@
public void testTraceMsg_1() throws Exception {
TextConsole fixture = new TextConsole();
- fixture.setDebug(true);
String traceMessage = "test";
Level traceLevel = Level.WARNING;
@@ -83,6 +82,5 @@
@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,6 +94,5 @@
@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;
Index: /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java
===================================================================
--- /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java (revision 673)
+++ /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java (revision 674)
@@ -21,11 +21,18 @@
public class TextConsole implements IOutputListener, IErrorListener,
ITraceListener, IExceptionListener {
-
+
/**
- *
- * In the debug mode, trace messages will be printed.
- *
+ * Defines the trace level used by this console.
*/
- private boolean debugMode = true;
+ private Level traceLevel;
+
+ /**
+ *
+ * Creates a new text console and automatically registers it as observer. The trace level is {@link Level#WARNING}.
+ *
+ */
+ public TextConsole() {
+ this(Level.WARNING);
+ }
/**
@@ -33,10 +40,12 @@
* Creates a new text console and automatically registers it as observer.
*
+ * @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,5 +93,5 @@
@Override
public void traceMsg(String traceMessage, Level level) {
- if (debugMode) {
+ if (level.intValue()>=traceLevel.intValue()) {
System.out.print("[" + level.toString() + "] " + traceMessage);
}
@@ -95,11 +104,6 @@
* {@code stdin}.
*
- *
- * @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,15 +140,3 @@
}
- /**
- *
- * Configures if the debug mode of the text console is enabled.
- *
- *
- * @param debug
- * if true, debug mode is enabled.
- */
- public void setDebug(boolean debug) {
- debugMode = debug;
- }
-
}
Index: /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java
===================================================================
--- /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java (revision 673)
+++ /trunk/quest-runner/src/main/java/de/ugoe/cs/quest/ui/Runner.java (revision 674)
@@ -5,4 +5,5 @@
import java.io.IOException;
import java.util.List;
+import java.util.logging.Level;
import joptsimple.OptionException;
@@ -70,7 +71,7 @@
parser.accepts("ui", "Allowed values: text, swt").withRequiredArg()
.ofType(UITYPE.class).defaultsTo(UITYPE.text);
- OptionSpec trace =
- parser.accepts("trace", "Allowed values: enable, disable").withRequiredArg()
- .ofType(LOG4JTYPE.class).defaultsTo(LOG4JTYPE.enable);
+ OptionSpec 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,15 +93,12 @@
{
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;
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (revision 673)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (revision 674)
@@ -2,4 +2,5 @@
import java.util.List;
+import java.util.logging.Level;
import org.eclipse.swt.widgets.Display;
@@ -29,4 +30,6 @@
private List startupCommands;
+
+ private final Level traceLevel;
protected Shell shlEventbenchConsole;
@@ -45,6 +48,7 @@
protected CommandHistoryDialog historyDialog;
- public MainWindow(List startupCommands) {
+ public MainWindow(List startupCommands, Level traceLevel) {
this.startupCommands = startupCommands;
+ this.traceLevel = traceLevel;
}
@@ -59,5 +63,5 @@
Display display = Display.getDefault();
createContents();
- new SWTConsole(consoleTabComposite.textConsoleOutput);
+ new SWTConsole(consoleTabComposite.textConsoleOutput, traceLevel);
historyDialog = new CommandHistoryDialog(shlEventbenchConsole, SWT.NONE);
shlEventbenchConsole.open();
Index: /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java
===================================================================
--- /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (revision 673)
+++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (revision 674)
@@ -18,7 +18,9 @@
{
- 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,4 +28,5 @@
Console.getInstance().registerCommandListener(this);
this.output = styledText;
+ this.traceLevel = traceLevel;
}
@@ -40,5 +43,7 @@
@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);
+ }
}