From 2c42ee071c1556a9cb6816f908cdd25eea8f650e Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 1 Apr 2022 00:57:55 +0200 Subject: [PATCH] [DEV] update log interface --- src/org/atriasoft/loader3d/internal/Log.java | 57 +++++++++++--------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/src/org/atriasoft/loader3d/internal/Log.java b/src/org/atriasoft/loader3d/internal/Log.java index fbae696..2045778 100644 --- a/src/org/atriasoft/loader3d/internal/Log.java +++ b/src/org/atriasoft/loader3d/internal/Log.java @@ -4,7 +4,7 @@ import io.scenarium.logger.LogLevel; import io.scenarium.logger.Logger; public class Log { - private static final boolean FORCE_DISPLAY = true; + private static final boolean FORCE_ALL = false; private static final String LIB_NAME = "loader3d"; 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); @@ -16,51 +16,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 || FORCE_DISPLAY) { - Logger.critical(Log.LIB_NAME_DRAW, data); + public static void critical(final Exception e, final String data) { + e.printStackTrace(); + if (PRINT_CRITICAL || FORCE_ALL) { + Logger.critical(LIB_NAME_DRAW, data + " : " + e.getMessage()); } } - public static void debug(final String data) { - if (Log.PRINT_DEBUG || FORCE_DISPLAY) { - 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 error(final String data) { - if (Log.PRINT_ERROR || FORCE_DISPLAY) { - 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 || FORCE_DISPLAY) { - 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 || FORCE_DISPLAY) { - 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 || FORCE_DISPLAY) { - 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 || FORCE_DISPLAY) { - 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 || FORCE_DISPLAY) { - 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); } }