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

[jalview.git] / src / jalview / util / MessageManager.java

diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java
index acd4591..e55bfab 100644 (file)
--- a/src/jalview/util/MessageManager.java
+++ b/src/jalview/util/MessageManager.java
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 import java.util.Set;
 
-import jalview.log.JLoggerLog4j;
+import jalview.bin.Console;
 
 /**
  * 
@@ -40,9 +40,6 @@ public class MessageManager
 {
   private static ResourceBundle rb;
 
-  private static JLoggerLog4j log = JLoggerLog4j
-          .getLogger(MessageManager.class.getCanonicalName());
-
   private static Locale loc;
 
   private static Set<String> reportedMissing = new HashSet<>();
@@ -55,7 +52,7 @@ public class MessageManager
       loc = Locale.getDefault();
       // Locale.setDefault(loc);
       /* Getting messages for GV */
-      log.info("Getting messages for lang: " + loc);
+      Console.info("Getting messages for lang: " + loc);
       Control control = Control.getControl(Control.FORMAT_PROPERTIES);
       rb = ResourceBundle.getBundle("lang.Messages", loc, control);
       // if (log.isLoggable(Level.FINEST))
@@ -65,12 +62,12 @@ public class MessageManager
       // }
     } catch (Exception q)
     {
-      log.warn("Exception when initting Locale for i18n messages\n"
+      Console.warn("Exception when initting Locale for i18n messages\n"
               + q.getMessage());
       q.printStackTrace();
     } catch (Error v)
     {
-      log.warn("Error when initting Locale for i18n messages\n"
+      Console.warn("Error when initting Locale for i18n messages\n"
               + v.getMessage());
       v.printStackTrace();
     }
@@ -119,7 +116,7 @@ public class MessageManager
       return MessageFormat.format(rb.getString(key), params);
     } catch (Exception e)
     {
-      log.warn("I18N missing: " + loc + "\t" + key);
+      Console.warn("I18N missing: " + loc + "\t" + key);
     }
     String value = "[missing key] " + key + "";
     for (Object p : params)
@@ -186,7 +183,7 @@ public class MessageManager
     if (!reportedMissing.contains(key))
     {
       reportedMissing.add(key);
-      log.info(msg);
+      Console.info(msg);
     }
   }
 }