X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMessageManager.java;h=3dace12469530cb2170acb24b42020cf6284e69f;hb=b7791df75a2e535cfe438e85b101918eedeb71dc;hp=db2cfec92ba2e5cda48b6ee5d60f321b51b8a56f;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java
index db2cfec..3dace12 100644
--- a/src/jalview/util/MessageManager.java
+++ b/src/jalview/util/MessageManager.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -23,8 +23,11 @@ package jalview.util;
 import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.ResourceBundle.Control;
+//import java.util.logging.Level;
+//import java.util.logging.Logger;
+
+import org.apache.log4j.Logger;
 
 /**
  * 
@@ -36,10 +39,12 @@ import java.util.logging.Logger;
 public class MessageManager
 {
 
+  // BH 2018 switched to org.apache.llog4j.Logger
+
   private static ResourceBundle rb;
 
-  private static Logger log = Logger.getLogger(MessageManager.class
-          .getCanonicalName());
+  private static Logger log = Logger
+          .getLogger(MessageManager.class.getCanonicalName());
 
   private static Locale loc;
 
@@ -52,20 +57,21 @@ public class MessageManager
       // Locale.setDefault(loc);
       /* Getting messages for GV */
       log.info("Getting messages for lang: " + loc);
-      rb = ResourceBundle.getBundle("lang.Messages", loc);
-      if (log.isLoggable(Level.FINEST))
-      {
-        // this might take a while, so we only do it if it will be shown
-        log.finest("Language keys: " + rb.keySet());
-      }
+      Control control = Control.getControl(Control.FORMAT_PROPERTIES);
+      rb = ResourceBundle.getBundle("lang.Messages", loc, control);
+      // if (log.isLoggable(Level.FINEST))
+      // {
+      // // this might take a while, so we only do it if it will be shown
+      // log.info("Language keys: " + rb.keySet()); // was FINEST
+      // }
     } catch (Exception q)
     {
-      log.warning("Exception when initting Locale for i18n messages\n"
+      log.warn("Exception when initting Locale for i18n messages\n"
               + q.getMessage());
       q.printStackTrace();
     } catch (Error v)
     {
-      log.warning("Error when initting Locale for i18n messages\n"
+      log.warn("Error when initting Locale for i18n messages\n"
               + v.getMessage());
       v.printStackTrace();
     }
@@ -80,7 +86,7 @@ public class MessageManager
       value = rb.getString(key);
     } catch (Exception e)
     {
-      log.warning("I18N missing: " + loc + "\t" + key);
+      log.warn("I18N missing: " + loc + "\t" + key);
     }
     return value;
   }
@@ -92,15 +98,20 @@ public class MessageManager
 
   public static String formatMessage(String key, Object... params)
   {
-    return MessageFormat.format(rb.getString(key), (Object[]) params);
+    return MessageFormat.format(getString(key), params);
+  }
+
+  public static String formatMessage(String key, String[] params)
+  {
+    return MessageFormat.format(getString(key), (Object[]) params);
   }
 
   /**
-   * lookup and return a key given a root and a human-readable(ish) name that
+   * Looks up and returns a key given a root and a human-readable(ish) name that
    * when combined might resolve to an i18n string. If the key doesn't resolve,
-   * then name is returned.if the key doesn't exist. Use this for
-   * programatically constructed keys that have have a human readable
-   * alternative used in the program (e.g. BLOSUM62 and label.score_blosum62)
+   * then name is returned. Use this for programmatically constructed keys that
+   * have a human readable alternative used in the program (e.g. BLOSUM62 and
+   * label.score_blosum62).
    * 
    * @param keyroot
    * @param name
@@ -114,8 +125,8 @@ public class MessageManager
       name = rb.getString(smkey);
     } catch (Exception x)
     {
-      log.finest("I18N missing key with root " + keyroot + ": " + loc
-              + "\t" + smkey);
+      log.info("I18N missing key with root " + keyroot + ": " + loc + "\t"
+              + smkey); // was FINEST
     }
     return name;
   }