From 26a5b316deb468e14d6caca4fadc4ccd7579db9b Mon Sep 17 00:00:00 2001 From: donington Date: Sat, 12 Jan 2013 00:16:03 -0500 Subject: [PATCH] FMLLogFormatter: dynamic log level name FMLLogFormatter now uses getLocalizedName or getName for log level name Changes to be committed: modified: common/cpw/mods/fml/relauncher/FMLLogFormatter.java --- .../mods/fml/relauncher/FMLLogFormatter.java | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/common/cpw/mods/fml/relauncher/FMLLogFormatter.java b/common/cpw/mods/fml/relauncher/FMLLogFormatter.java index 7f81db1b11..7768e738e5 100644 --- a/common/cpw/mods/fml/relauncher/FMLLogFormatter.java +++ b/common/cpw/mods/fml/relauncher/FMLLogFormatter.java @@ -22,33 +22,19 @@ final class FMLLogFormatter extends Formatter msg.append(this.dateFormat.format(Long.valueOf(record.getMillis()))); Level lvl = record.getLevel(); - if (lvl == Level.FINEST) + String name = lvl.getLocalizedName(); + if ( name == null ) { - msg.append(" [FINEST] "); + name = lvl.getName(); } - else if (lvl == Level.FINER) + + if ( ( name != null ) && ( name.length() > 0 ) ) { - msg.append(" [FINER] "); + msg.append(" [" + name + "] "); } - else if (lvl == Level.FINE) + else { - msg.append(" [FINE] "); - } - else if (lvl == Level.INFO) - { - msg.append(" [INFO] "); - } - else if (lvl == Level.WARNING) - { - msg.append(" [WARNING] "); - } - else if (lvl == Level.SEVERE) - { - msg.append(" [SEVERE] "); - } - else if (lvl == Level.SEVERE) - { - msg.append(" [" + lvl.getLocalizedName() + "] "); + msg.append(" "); } if (record.getLoggerName() != null)