import java.util.ResourceBundle.Control;
import java.util.Set;
-import org.apache.log4j.Logger;
+import jalview.bin.Console;
/**
*
{
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<>();
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))
// }
} 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();
}
} catch (Exception e)
{
String msg = "I18N missing: " + loc + "\t" + key;
- logWarning(key, msg);
+ logWarning(key, msg);
}
return value;
}
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)
*/
public static String getStringOrReturn(String keyroot, String name)
{
- String smkey = keyroot + name.toLowerCase(Locale.ROOT).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;
}
* @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);
+ }
}
}