Changeset 633 for trunk/quest-ui-core/src/main/java/de/ugoe

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

File:

• trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/log4j/Log4JLogger.java (modified) (3 diffs)

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;
+        }
 }