AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-07-04 17:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into adminworld

Browse Source 
Conflicts:
	appinfo.properties
	buildnumber.properties
This commit is contained in:
Steven Lawson 2013-08-22 17:08:52 -04:00
commit 6d0b8362b7
3 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appinfo.properties
View File

@ -1,5 +1,5 @@
#Wed, 21 Aug 2013 19:57:49 -0400 #Thu, 22 Aug 2013 17:08:21 -0400
program.VERSION=3.1 program.VERSION=3.1
program.BUILDNUM=473 program.BUILDNUM=475
program.BUILDDATE=08/21/2013 07\:57 PM program.BUILDDATE=08/22/2013 05\:08 PM

4
buildnumber.properties
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Wed Aug 21 19:57:49 EDT 2013 #Thu Aug 22 17:08:21 EDT 2013
build.number=474 build.number=476

59
src/me/StevenLawson/TotalFreedomMod/TFM_Log.java
View File

@ -14,40 +14,55 @@ public class TFM_Log
throw new AssertionError(); 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) info(message, false);
{
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);
}
} }
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) private static void log(Level level, String message, boolean raw)
{ {
getLogger(raw).log(level, message); getLogger(raw).log(level, message);