Merge branch 'develop' into features/JAL-518_justify_seqs_in_region

[jalview.git] / src / jalview / log / JLogger.java

diff --git a/src/jalview/log/JLogger.java b/src/jalview/log/JLogger.java
index 45dde90..554b997 100644 (file)
--- a/src/jalview/log/JLogger.java
+++ b/src/jalview/log/JLogger.java
@@ -20,6 +20,7 @@
  */
 package jalview.log;
 
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,6 +47,16 @@ public abstract class JLogger implements JLoggerI
   protected abstract void loggerLogMessage(LogLevel level, String message,
           Throwable t);
 
+  public static boolean isLevel(String levelString)
+  {
+    for (LogLevel l : EnumSet.allOf(LogLevel.class))
+    {
+      if (l.name().equals(levelString))
+        return true;
+    }
+    return false;
+  }
+
   public static LogLevel toLevel(String levelString)
   {
     try
@@ -60,7 +71,7 @@ public abstract class JLogger implements JLoggerI
 
   public static JLogger getLogger(Class c)
   {
-    return getLogger(c);
+    return getLogger(c, LogLevel.INFO);
   }
 
   public static JLogger getLogger(Class c, LogLevel loglevel)
@@ -127,13 +138,13 @@ public abstract class JLogger implements JLoggerI
     {
       String logLine = String.format("%s: %s", loglevel.toString(),
               message);
-      System.out.println(logLine);
+      jalview.bin.Console.outPrintln(logLine);
       if (t != null)
       {
         if (loglevel.compareTo(LogLevel.DEBUG) <= 0)
           t.printStackTrace(System.err);
         else
-          System.err.println(t.getMessage());
+          jalview.bin.Console.errPrintln(t.getMessage());
       }
       return false;
     }