Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

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

diff --git a/src/jalview/log/JLogger.java b/src/jalview/log/JLogger.java
index 714b0de..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;
 
@@ -48,7 +49,7 @@ public abstract class JLogger implements JLoggerI
 
   public static boolean isLevel(String levelString)
   {
-    for (LogLevel l : LogLevel.values())
+    for (LogLevel l : EnumSet.allOf(LogLevel.class))
     {
       if (l.name().equals(levelString))
         return true;
@@ -137,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;
     }