diff --git a/src/org/atriasoft/ejson/Ejson.java b/src/org/atriasoft/ejson/Ejson.java index b83ecfa..607c1d0 100644 --- a/src/org/atriasoft/ejson/Ejson.java +++ b/src/org/atriasoft/ejson/Ejson.java @@ -52,7 +52,6 @@ public class Ejson { final byte[] elemData = Uri.getAllData(data); if (elemData == null) { Log.error("Can not read the Stream : " + data); - Log.displayBackTrace(); return null; } final String dataToParse = new String(elemData); diff --git a/src/org/atriasoft/ejson/internal/Log.java b/src/org/atriasoft/ejson/internal/Log.java index fdd8958..5b2e2e9 100644 --- a/src/org/atriasoft/ejson/internal/Log.java +++ b/src/org/atriasoft/ejson/internal/Log.java @@ -9,6 +9,7 @@ import io.scenarium.logger.LogLevel; import io.scenarium.logger.Logger; public class Log { + private static final boolean FORCE_ALL = false; private static final String LIB_NAME = "ejson"; private static final String LIB_NAME_DRAW = Logger.getDrawableName(Log.LIB_NAME); private static final boolean PRINT_CRITICAL = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.CRITICAL); @@ -20,62 +21,58 @@ public class Log { private static final boolean PRINT_VERBOSE = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.VERBOSE); private static final boolean PRINT_WARNING = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.WARNING); - public static void critical(final String data) { - if (Log.PRINT_CRITICAL) { - Logger.critical(Log.LIB_NAME_DRAW, data); - } - } - - public static void critical(final String data, final Exception e) { + public static void critical(final Exception e, final String data) { e.printStackTrace(); - if (Log.PRINT_CRITICAL) { - Logger.critical(Log.LIB_NAME_DRAW, data + " : " + e.getMessage()); + if (PRINT_CRITICAL || FORCE_ALL) { + Logger.critical(LIB_NAME_DRAW, data + " : " + e.getMessage()); } } - public static void debug(final String data) { - if (Log.PRINT_DEBUG) { - Logger.debug(Log.LIB_NAME_DRAW, data); + public static void critical(final String data, final Object... objects) { + if (PRINT_CRITICAL || FORCE_ALL) { + Logger.critical(LIB_NAME_DRAW, data, objects); } } - public static void displayBackTrace() { - Logger.displayBackTrace(Log.LIB_NAME_DRAW); - } - - public static void error(final String data) { - if (Log.PRINT_ERROR) { - Logger.error(Log.LIB_NAME_DRAW, data); + public static void debug(final String data, final Object... objects) { + if (PRINT_DEBUG || FORCE_ALL) { + Logger.debug(LIB_NAME_DRAW, data, objects); } } - public static void info(final String data) { - if (Log.PRINT_INFO) { - Logger.info(Log.LIB_NAME_DRAW, data); + public static void error(final String data, final Object... objects) { + if (PRINT_ERROR || FORCE_ALL) { + Logger.error(LIB_NAME_DRAW, data, objects); } } - public static void print(final String data) { - if (Log.PRINT_PRINT) { - Logger.print(Log.LIB_NAME_DRAW, data); + public static void info(final String data, final Object... objects) { + if (PRINT_INFO || FORCE_ALL) { + Logger.info(LIB_NAME_DRAW, data, objects); } } - public static void todo(final String data) { - if (Log.PRINT_TODO) { - Logger.todo(Log.LIB_NAME_DRAW, data); + public static void print(final String data, final Object... objects) { + if (PRINT_PRINT || FORCE_ALL) { + Logger.print(LIB_NAME_DRAW, data, objects); } } - public static void verbose(final String data) { - if (Log.PRINT_VERBOSE) { - Logger.verbose(Log.LIB_NAME_DRAW, data); + public static void todo(final String data, final Object... objects) { + if (PRINT_TODO || FORCE_ALL) { + Logger.todo(LIB_NAME_DRAW, data, objects); } } - public static void warning(final String data) { - if (Log.PRINT_WARNING) { - Logger.warning(Log.LIB_NAME_DRAW, data); + public static void verbose(final String data, final Object... objects) { + if (PRINT_VERBOSE || FORCE_ALL) { + Logger.verbose(LIB_NAME_DRAW, data, objects); + } + } + + public static void warning(final String data, final Object... objects) { + if (PRINT_WARNING || FORCE_ALL) { + Logger.warning(LIB_NAME_DRAW, data, objects); } }