JAL-3810 - Add trace method to javascript implementation of Logger

[jalview.git] / src / jalview / javascript / log4j / Logger.java

diff --git a/src/jalview/javascript/log4j/Logger.java b/src/jalview/javascript/log4j/Logger.java
index bb7eb34..340e1f9 100644 (file)
--- a/src/jalview/javascript/log4j/Logger.java
+++ b/src/jalview/javascript/log4j/Logger.java
@@ -56,7 +56,7 @@ public class Logger
     if (logger == null)
     {
       registry.put(name, logger = new Logger(name));
-      logger.setLevel(Level.INFO);
+      logger.setLevel(Level.DEBUG);
     }
     return logger;
   }
@@ -80,6 +80,21 @@ public class Logger
   {
     return isEnabled;
   }
+  
+  public void trace(Object o)
+  {
+    trace(o, null);
+  }
+  
+  public void trace(Object o, Throwable e)
+  {
+    switch (level.level)
+    {
+    case Level.TRACE_INT:
+      log(o, e);
+      break;
+    }
+  }
 
   public void debug(Object o)
   {
@@ -90,11 +105,8 @@ public class Logger
   {
     switch (level.level)
     {
-    case Priority.FATAL_INT:
-    case Priority.ERROR_INT:
-    case Priority.WARN_INT:
-    case Priority.INFO_INT:
     case Priority.DEBUG_INT:
+    case Level.TRACE_INT:
       log(o, e);
       break;
     }
@@ -109,10 +121,9 @@ public class Logger
   {
     switch (level.level)
     {
-    case Priority.FATAL_INT:
-    case Priority.ERROR_INT:
-    case Priority.WARN_INT:
     case Priority.INFO_INT:
+    case Priority.DEBUG_INT:
+    case Level.TRACE_INT:
       log(o, e);
       break;
     }
@@ -128,9 +139,10 @@ public class Logger
   {
     switch (level.level)
     {
-    case Priority.FATAL_INT:
-    case Priority.ERROR_INT:
     case Priority.WARN_INT:
+    case Priority.INFO_INT:
+    case Priority.DEBUG_INT:
+    case Level.TRACE_INT:
       log(o, e);
       break;
     }
@@ -146,8 +158,11 @@ public class Logger
   {
     switch (level.level)
     {
-    case Priority.FATAL_INT:
     case Priority.ERROR_INT:
+    case Priority.WARN_INT:
+    case Priority.INFO_INT:
+    case Priority.DEBUG_INT:
+    case Level.TRACE_INT:
       log(o, e);
       break;
     }
@@ -159,27 +174,15 @@ public class Logger
     switch (level.level)
     {
     case Priority.ERROR_INT:
-      if (appender == null)
-      {
-        System.err.println(s);
-        return;
-      }
-      break;
     case Priority.WARN_INT:
       if (appender == null)
       {
         System.err.println(s);
         return;
       }
-      break;
     case Priority.INFO_INT:
-      if (appender == null)
-      {
-        System.out.println(s);
-        return;
-      }
-      break;
     case Priority.DEBUG_INT:
+    case Level.TRACE_INT:
       if (appender == null)
       {
         System.out.println(s);
@@ -187,7 +190,10 @@ public class Logger
       }
       break;
     }
-    e.printStackTrace();
+    if (e != null)
+    {
+      e.printStackTrace();
+    }
     appender.append(new LoggingEvent(this, s.toString(), level));
   }