From 23907ef7e47762c10f9d5776a5f876a354ee9097 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Tue, 20 Aug 2013 20:44:39 -0400 Subject: [PATCH] Use plugin/server loggers. --- appinfo.properties | 6 ++-- buildnumber.properties | 4 +-- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 29 ++++++++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index 25289c9e..a4b8a692 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 20 Aug 2013 20:00:13 -0400 +#Tue, 20 Aug 2013 20:43:47 -0400 program.VERSION=3.1 -program.BUILDNUM=470 -program.BUILDDATE=08/20/2013 08\:00 PM +program.BUILDNUM=472 +program.BUILDDATE=08/20/2013 08\:43 PM diff --git a/buildnumber.properties b/buildnumber.properties index 25c871e7..49eb3832 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Aug 20 20:00:13 EDT 2013 -build.number=471 +#Tue Aug 20 20:43:47 EDT 2013 +build.number=473 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index d5cab8c4..3698a881 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -6,8 +6,6 @@ import org.bukkit.Bukkit; public class TFM_Log { - private static final Logger LOGGER = Bukkit.getLogger(); - private TFM_Log() { throw new AssertionError(); @@ -49,11 +47,34 @@ public class TFM_Log private static void log(Level level, String message, boolean raw) { - LOGGER.log(level, (raw ? "" : "[" + TotalFreedomMod.pluginName + "]: ") + message); + LoggerType.getLogger(raw).log(level, message); } private static void log(Level level, Throwable throwable) { - LOGGER.log(level, null, throwable); + LoggerType.SERVER.getLogger().log(level, null, throwable); + } + + private static enum LoggerType + { + SERVER(Bukkit.getLogger()), + PLUGIN(TotalFreedomMod.plugin.getLogger()); + // + private final Logger logger; + + private LoggerType(Logger logger) + { + this.logger = logger; + } + + public Logger getLogger() + { + return logger; + } + + public static Logger getLogger(boolean getRawLogger) + { + return (getRawLogger ? SERVER.getLogger() : PLUGIN.getLogger()); + } } }