Changeset 633 for trunk/java-utils

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/java-utils/src/main/java/de/ugoe/cs/util/console

Files:

• Console.java (modified) (5 diffs)
• TextConsole.java (modified) (2 diffs)
• listener/ITraceListener.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);
 }