* Sends a debug message to all observers containing the message that was - * passed to this function. + * passed to this function. The default log {@link Level} is {@link Level#INFO}. *
* @@ -419,8 +420,24 @@ * message that is send to the observers */ + @Deprecated public static void trace(String traceMsg) { for (ITraceListener observer : theInstance.traceListener) { - observer.traceMsg(traceMsg); - } + observer.traceMsg(traceMsg, Level.INFO); + } + } + + /** + * + *+ * Sends a debug message to all trace listeners containing the message that was passed to this function. + *
+ * + * @param traceMsg message that is send to the trace listener + * @param logLevel log level of the message + */ + public static void trace(String traceMsg, Level logLevel) { + for( ITraceListener observer : theInstance.traceListener) { + observer.traceMsg(traceMsg, logLevel); + } } @@ -429,5 +446,5 @@ * Sends a debug message to all observers containing the message that was * passed to this function and adds an {@link StringTools#ENDLINE} to the - * message. + * message. The default log {@link Level} is {@link Level#INFO}. * * @@ -435,8 +452,25 @@ * message that is send to the observers */ + @Deprecated public static void traceln(String traceMsg) { for (ITraceListener observer : theInstance.traceListener) { - observer.traceMsg(traceMsg + StringTools.ENDLINE); - } + observer.traceMsg(traceMsg + StringTools.ENDLINE, Level.INFO); + } + } + + /** + *+ * Sends a debug message to all observers containing the message that was + * passed to this function and adds an {@link StringTools#ENDLINE} to the + * message. + *
+ * + * @param traceMsg message that is send to the observers + * @param logLevel log levle of the message + */ + public static void traceln(String traceMsg, Level logLevel) { + for( ITraceListener observer : theInstance.traceListener) { + observer.traceMsg(traceMsg + StringTools.ENDLINE, logLevel); + } } 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 632) +++ /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java (revision 633) @@ -3,4 +3,5 @@ import java.io.IOException; import java.nio.charset.Charset; +import java.util.logging.Level; import de.ugoe.cs.util.console.listener.IErrorListener; @@ -82,7 +83,7 @@ */ @Override - public void traceMsg(String traceMessage) { + public void traceMsg(String traceMessage, Level level) { if (debugMode) { - System.out.print(traceMessage); + System.out.print("[" + level.toString() + "] " + traceMessage); } } Index: /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/listener/ITraceListener.java =================================================================== --- /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/listener/ITraceListener.java (revision 632) +++ /trunk/java-utils/src/main/java/de/ugoe/cs/util/console/listener/ITraceListener.java (revision 633) @@ -1,3 +1,5 @@ package de.ugoe.cs.util.console.listener; + +import java.util.logging.Level; import de.ugoe.cs.util.console.Console; @@ -18,6 +20,8 @@ * * @param traceMessage - * error message + * trace message + * @param level + * trace level */ - public void traceMsg(String traceMessage); + public void traceMsg(String traceMessage, Level level); } Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java (revision 632) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java (revision 633) @@ -1,3 +1,5 @@ package de.ugoe.cs.quest.log4j; + +import java.util.logging.Level; import org.apache.log4j.Logger; @@ -75,6 +77,6 @@ */ @Override - public void traceMsg(String traceMessage) { - logger.trace(traceMessage); + public void traceMsg(String traceMessage, Level level) { + logger.log(convertToLog4JLevel(level), traceMessage); } @@ -90,3 +92,28 @@ logger.error(errMessage); } + + /** + *+ * Converts the log level described by {@link Level} into a {@link org.apache.log4j.Level}. + *
+ * + * @param level java.util.logger.Level severity + * @return org.apache.log4j.Level severity + */ + private org.apache.log4j.Level convertToLog4JLevel(Level level) { + if(level==Level.OFF) { + return org.apache.log4j.Level.OFF; + } + if(level==Level.SEVERE) { + return org.apache.log4j.Level.FATAL; + } + if(level==Level.WARNING) { + return org.apache.log4j.Level.WARN; + } + if(level==Level.INFO || level==Level.CONFIG) { + return org.apache.log4j.Level.INFO; + } + // remaining levels: FINE, FINER, FINEST, ALL + return org.apache.log4j.Level.ALL; + } } 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 632) +++ /trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (revision 633) @@ -1,4 +1,6 @@ package de.ugoe.cs.quest.ui.swt; + +import java.util.logging.Level; import org.eclipse.swt.SWT; @@ -38,6 +40,6 @@ @Override - public void traceMsg(String traceMessage) { - appendColored(traceMessage, SWT.COLOR_BLUE); + public void traceMsg(String traceMessage, Level level) { + appendColored("[" + level.toString() + "] " + traceMessage, SWT.COLOR_BLUE); }