From 10f905ea364c2a73426a0e89ddf679bb63c6baa7 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Thu, 22 Aug 2013 16:56:17 -0400 Subject: [PATCH] Got rid of varargs in logger, possible cause of exceptions. --- appinfo.properties | 6 +- buildnumber.properties | 4 +- .../StevenLawson/TotalFreedomMod/TFM_Log.java | 59 ++++++++++++------- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/appinfo.properties b/appinfo.properties index a4b8a692..afa2591b 100644 --- a/appinfo.properties +++ b/appinfo.properties @@ -1,5 +1,5 @@ -#Tue, 20 Aug 2013 20:43:47 -0400 +#Thu, 22 Aug 2013 16:55:02 -0400 program.VERSION=3.1 -program.BUILDNUM=472 -program.BUILDDATE=08/20/2013 08\:43 PM +program.BUILDNUM=473 +program.BUILDDATE=08/22/2013 04\:55 PM diff --git a/buildnumber.properties b/buildnumber.properties index 49eb3832..d33f7a90 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Tue Aug 20 20:43:47 EDT 2013 -build.number=473 +#Thu Aug 22 16:55:02 EDT 2013 +build.number=474 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java index f0f5f3ef..35877e95 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Log.java @@ -14,40 +14,55 @@ public class TFM_Log throw new AssertionError(); } - public static void info(Object... params) + //Level.INFO: + public static void info(String message) { - prepareLogMessage(Level.INFO, params); + info(message, false); } - public static void warning(Object... params) + public static void info(String message, Boolean raw) { - prepareLogMessage(Level.WARNING, params); + log(Level.INFO, message, raw); } - public static void severe(Object... params) + public static void info(Throwable ex) { - prepareLogMessage(Level.SEVERE, params); + log(Level.INFO, ex); } - private static void prepareLogMessage(Level level, Object... params) + //Level.WARNING: + public static void warning(String message) { - if (params.length == 0) - { - return; - } - - Object payload = params[0]; - - if (payload instanceof Throwable) - { - log(level, (Throwable) payload); - } - else - { - log(level, payload.toString(), params.length >= 2 && params[1] instanceof Boolean ? (Boolean) params[1] : false); - } + info(message, false); } + public static void warning(String message, Boolean raw) + { + log(Level.WARNING, message, raw); + } + + public static void warning(Throwable ex) + { + log(Level.WARNING, ex); + } + + //Level.SEVERE: + public static void severe(String message) + { + info(message, false); + } + + public static void severe(String message, Boolean raw) + { + log(Level.SEVERE, message, raw); + } + + public static void severe(Throwable ex) + { + log(Level.SEVERE, ex); + } + + //Utility private static void log(Level level, String message, boolean raw) { getLogger(raw).log(level, message);