X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMessageManager.java;h=e55bfab087f0f7bc6ed609d85e6d368bd31cad01;hb=d0aee5b0b2cbd0805c3dec027c6f2d2ac0148e66;hp=c562d8df81ae88c5c5415dd4e337a98f6c2c1d40;hpb=c4e814d2930b175c789c2a004801b7b8a1dacd32;p=jalview.git diff --git a/src/jalview/util/MessageManager.java b/src/jalview/util/MessageManager.java index c562d8d..e55bfab 100644 --- a/src/jalview/util/MessageManager.java +++ b/src/jalview/util/MessageManager.java @@ -27,8 +27,7 @@ import java.util.ResourceBundle; import java.util.ResourceBundle.Control; import java.util.Set; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import jalview.bin.Console; /** * @@ -41,10 +40,6 @@ public class MessageManager { private static ResourceBundle rb; - // BH 2018 switched to org.apache.llog4j.Logger - private static Logger log = LogManager - .getLogger(MessageManager.class.getCanonicalName()); - private static Locale loc; private static Set reportedMissing = new HashSet<>(); @@ -57,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)) @@ -67,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(); } @@ -121,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) @@ -188,7 +183,7 @@ public class MessageManager if (!reportedMissing.contains(key)) { reportedMissing.add(key); - log.info(msg); + Console.info(msg); } } }