JAL-4274 Use Cache BITMAP_* if no other image restrictions given

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

diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java
index bb94566..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 org.apache.log4j.Logger;
+import jalview.bin.Console;
 
 /**
  * 
@@ -40,10 +40,6 @@ public class MessageManager
 {
   private static ResourceBundle rb;
 
-  // BH 2018 switched to org.apache.llog4j.Logger
-  private static Logger log = Logger
-          .getLogger(MessageManager.class.getCanonicalName());
-
   private static Locale loc;
 
   private static Set<String> reportedMissing = new HashSet<>();
@@ -56,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))
@@ -66,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();
     }
@@ -94,7 +90,7 @@ public class MessageManager
     } catch (Exception e)
     {
       String msg = "I18N missing: " + loc + "\t" + key;
-         logWarning(key, msg);
+      logWarning(key, msg);
     }
     return value;
   }
@@ -120,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)
@@ -162,15 +158,16 @@ public class MessageManager
    */
   public static String getStringOrReturn(String keyroot, String name)
   {
-    String smkey = keyroot + name.toLowerCase().replaceAll(" ", "");
+    String smkey = keyroot
+            + name.toLowerCase(Locale.ROOT).replaceAll(" ", "");
     try
     {
       name = rb.getString(smkey);
     } catch (Exception x)
     {
-      String msg = "I18N missing key with root " + keyroot + ": " + loc + "\t"
-                         + smkey;
-         logWarning(smkey, msg);
+      String msg = "I18N missing key with root " + keyroot + ": " + loc
+              + "\t" + smkey;
+      logWarning(smkey, msg);
     }
     return name;
   }
@@ -181,12 +178,12 @@ public class MessageManager
    * @param key
    * @param msg
    */
-  private static void logWarning(String key, String msg) 
+  private static void logWarning(String key, String msg)
   {
-       if (!reportedMissing.contains(key))
-       {
+    if (!reportedMissing.contains(key))
+    {
       reportedMissing.add(key);
-         log.info(msg);
-       }
+      Console.info(msg);
+    }
   }
 }