Changeset 633

Timestamp:

08/27/12 15:17:00 (12 years ago)

Author:

sherbold

Message:

• updated tracing API of the Console. It now supports different trace levels, based on java.util.logger.Level

Location:

trunk

Files:

• java-utils/src/main/java/de/ugoe/cs/util/console/Console.java (modified) (5 diffs)
• java-utils/src/main/java/de/ugoe/cs/util/console/TextConsole.java (modified) (2 diffs)
• java-utils/src/main/java/de/ugoe/cs/util/console/listener/ITraceListener.java (modified) (2 diffs)
• quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java (modified) (3 diffs)
• quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (modified) (2 diffs)

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

@@ -3 +3 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.logging.Level;
 
 import de.ugoe.cs.util.StringTools;
@@ -413 +414 @@
          * <p>
          * 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}.
          * </p>
          * 
@@ -419 +420 @@
          *            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);
+                }
+        }
+        
+        /**
+         * 
+         * <p>
+         * Sends a debug message to all trace listeners containing the message that was passed to this function.
+         * </p>
+         *
+         * @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 +446 @@
          * 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}.
          * </p>
          * 
@@ -435 +452 @@
          *            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);
+                }
+        }
+        
+        /**
+         * <p>
+         * 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.
+         * </p>
+         *
+         * @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);
+            }
         }
 

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

@@ -3 +3 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.logging.Level;
 
 import de.ugoe.cs.util.console.listener.IErrorListener;
@@ -82 +83 @@
          */
         @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);
                 }
         }

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

@@ -1 +1 @@
 package de.ugoe.cs.util.console.listener;
+
+import java.util.logging.Level;
 
 import de.ugoe.cs.util.console.Console;
@@ -18 +20 @@
          * 
          * @param traceMessage
-         *            error message
+         *            trace message
+         * @param level
+         *            trace level
          */
-        public void traceMsg(String traceMessage);
+        public void traceMsg(String traceMessage, Level level);
 }

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java

@@ -1 +1 @@
 package de.ugoe.cs.quest.log4j;
+
+import java.util.logging.Level;
 
 import org.apache.log4j.Logger;
@@ -75 +77 @@
          */
         @Override
-        public void traceMsg(String traceMessage) {
-                logger.trace(traceMessage);
+        public void traceMsg(String traceMessage, Level level) {
+            logger.log(convertToLog4JLevel(level), traceMessage);
         }
 
@@ -90 +92 @@
                 logger.error(errMessage);
         }
+        
+        /**
+         * <p>
+         * Converts the log level described by {@link Level} into a {@link org.apache.log4j.Level}.
+         * </p>
+         *
+         * @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;
+        }
 }

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

@@ -1 +1 @@
 
 package de.ugoe.cs.quest.ui.swt;
+
+import java.util.logging.Level;
 
 import org.eclipse.swt.SWT;
@@ -38 +40 @@
 
     @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);
     }