FCL/sf/app/jrt: comparison javacommons/utils/javasrc/com/nokia/mj/impl/utils/Logger.java

equal deleted inserted replaced

-:4ad59aaee882
+:2f468c1958d0
 }
 catch (Exception e)
 {
-System.out.println(e.toString());
+System.err.println(e.toString());
 }
 }
 /**
 * Logging function for error messages
 * @param component a unique id of component
 * @param str emiting information
 */
 public static void ELOG(int component, String str)
 {
-_logging(component, EError, str);
+logImpl(component, EError, str);
 }
 /**
 * Logging function for errors, prints exception info and a backtrace of the stack
 * @param component a unique id of component
 * @param str emiting information
 * @param thrown exception object
 */
 public static void ELOG(int component, String str, Throwable thrown)
 {
+logImpl(component, EError, str, thrown);
-ByteArrayOutputStream byte_stream = new ByteArrayOutputStream();
-PrintStream print_stream = new PrintStream(byte_stream);
-_loggingException(component, EError, str, thrown, byte_stream, print_stream);
 }
 /**
 * Logging function for warning messages
 * @param component a unique id of component
 * @param str emiting information
 */
 public static void WLOG(int component, String str)
 {
-_logging(component, EWarning, str);
+logImpl(component, EWarning, str);
 }
 /**
 * Logging function for warnings, prints exception info and a backtrace of the stack
 * @param component a unique id of component
 * @param str emiting information
 * @param thrown exception object
 */
 public static void WLOG(int component, String str, Throwable thrown)
 {
-ByteArrayOutputStream byte_stream = new ByteArrayOutputStream();
+logImpl(component, EWarning, str, thrown);
-PrintStream print_stream = new PrintStream(byte_stream);
-_loggingException(component, EWarning, str, thrown, byte_stream, print_stream);
 }
 /**
 * Logging function for information ending to the products
 * @param component a unique id of component
 * @param str emiting information
 */
 public static void PLOG(int component, String str)
 {
-_logging(component, EInfoPrd, str);
+logImpl(component, EInfoPrd, str);
 }
 /**
 * Logging function for information ending to the products,
 * prints exception info and a backtrace of the stack
 * @param str emiting information
 * @param thrown exception object
 */
 public static void PLOG(int component, String str, Throwable thrown)
 {
-ByteArrayOutputStream byte_stream = new ByteArrayOutputStream();
+logImpl(component, EInfoPrd, str, thrown);
-PrintStream print_stream = new PrintStream(byte_stream);
-_loggingException(component, EInfoPrd, str, thrown, byte_stream, print_stream);
 }
 /**
 * Logging function for information ending to the debug releases
 * @param component a unique id of component
 * @param str emiting information
 */
 public static void ILOG(int component, String str)
 {
-_logging(component, EInfo, str);
+logImpl(component, EInfo, str);
 }
 /**
 * Logging function for information ending to the debug releases,
 * prints exception info and a backtrace of the stack
 * @param str emiting information
 * @param thrown exception object
 */
 public static void ILOG(int component, String str, Throwable thrown)
 {
-ByteArrayOutputStream byte_stream = new ByteArrayOutputStream();
+logImpl(component, EInfo, str, thrown);
-PrintStream print_stream = new PrintStream(byte_stream);
-_loggingException(component, EInfoPrd, str, thrown, byte_stream, print_stream);
 }
 /**
 * Used for function entries,
 * e.g. JELOG(Logger.EJavaCaptain, "-> myFunction()"
 */
 public static void JELOG(int component, String str)
 {
 if (Activated[component])
 {
-_logging(component, EEntry, str);
+logImpl(component, EEntry, str);
 }
 }
 /**
 * Used for high load data
 */
 public static void HLOG(int component, String str)
 {
 if (Activated[component])
 {
-_logging(component, EInfoHeavyLoad, str);
+logImpl(component, EInfoHeavyLoad, str);
 }
 }
 /**
 * Function for emitting debug traces at development time.
 * @param str emiting information
 */
 public static void LOG(int component, int level, String str)
 {
 if (Activated[component])
-_logging(component, level, str);
+{
+logImpl(component, level, str);
+}
 }
 /**
 * Function for printing an exception info and a backtrace of the stack to log at development time
 * This does not do anything in release builds
 */
 public static void LOG(int component, int level, String str, Throwable thrown)
 {
 if (Activated[component])
 {
-ByteArrayOutputStream byte_stream = new ByteArrayOutputStream();
+logImpl(component, level, str, thrown);
-PrintStream print_stream = new PrintStream(byte_stream);
+}
+}
-_loggingException(component, level, str, thrown, byte_stream, print_stream);
+/**
-}
+* Function for printing a log without an exception.
-}
+* @param component a unique id of component
+* @param level id level of tracing information
+* @param str emiting information
-/** Native function prototype. */
+*/
-private static native void _logging(int component, int level, String str);
+private static void logImpl(int component, int level, String str)
+{
-/** Native function for logging stack trace when exception happend */
+logImpl(component, level, str, null);
-private static native void _loggingException(int component, int level, String str, Throwable thrown,
+}
-ByteArrayOutputStream byte_stream, PrintStream print_stream);
+/**
+* Function for printing a log with optional exception.
+* @param component a unique id of component
+* @param level id level of tracing information
+* @param str emiting information
+* @param thrown exception object. If null then ignored
+*/
+private static void logImpl(int component, int level, String str, Throwable thrown)
+{
+if (str == null)
+{
+ELOG(component, "str argument was null!", new NullPointerException());
+}
+else
+{
+_logging(component, level, str, DebugUtils.getStackTrace(thrown));
+}
+}
+/**
+* Native function for printing a log with optional stack trace.
+* @param component a unique id of component
+* @param level id level of tracing information
+* @param str emiting information. Must not be null.
+* @param stackTrace of the exception object. Can be null and will then
+*                   be ignored.
+*/
+private static native void _logging(int component, int level, String str,
+String stackTrace);
 }

changeset 79	2f468c1958d0
parent 76	4ad59aaee882
child 80	d6dafc5d983f