X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Futil%2FLog.java;h=329382f92bbcd24707c0483e6a4c4a8d3a8b70ce;hb=3ed548fd4a192e962518da7756741eb8c44bd529;hp=37bfd5cb9532d6d8ee996d94a920128439bc22bf;hpb=77f562e1b6ef60e9ca0e9028dd4d4b9c8053dc69;p=org.ibex.core.git diff --git a/src/org/xwt/util/Log.java b/src/org/xwt/util/Log.java index 37bfd5c..329382f 100644 --- a/src/org/xwt/util/Log.java +++ b/src/org/xwt/util/Log.java @@ -14,7 +14,7 @@ import java.util.*; public class Log { public static boolean on = true; - public static boolean color = true; + public static boolean color = false; public static boolean verbose = false; public static boolean logDates = false; public static Date lastDate = null; @@ -48,13 +48,13 @@ public class Log { private static final int PURPLE = 35; private static final int BROWN = 33; private static final int GRAY = 37; - + private static String color(int color, boolean bright, String s) { if (!Log.color) return s; return - "" + ((char)27) + "[" + (bright?1:0) + ";" + color + "m" + + "\033[40;" + (bright?"1;":"") + color + "m" + s + - ((char)27) + "[0m"; + "\033[0m"; } private static String lastClassName = null; @@ -62,13 +62,13 @@ public class Log { if (firstMessage && !logDates) { firstMessage = false; System.err.println(color(GREEN, false, "===========================================================================")); - String incolor = color ? "in " + + diag(Log.class, "Logging enabled at " + new java.util.Date()); + if (color) diag(Log.class, "logging messages in " + color(BLUE, true, "c") + color(RED, true, "o") + color(CYAN, true, "l") + color(GREEN, true, "o") + - color(PURPLE, true, "r") + " " : ""; - diag(Log.class, "Logging enabled at " + new java.util.Date() + " " + incolor); + color(PURPLE, true, "r")); } String classname; @@ -84,6 +84,7 @@ public class Log { while (classname.length() < (logDates ? 14 : 20)) classname = " " + classname; classname = classname + (classname.trim().length() == 0 ? " " : ": "); classname = color(GRAY, true, classname); + classname = classname.replace('$', '.'); if (logDates) { Date d = new Date(); @@ -108,7 +109,7 @@ public class Log { try { String m = ""; while((s = br.readLine()) != null) m += s + "\n"; - log(o, m, level); + log(o, m.substring(0, m.length() - 1), level); } catch (IOException e) { System.err.println(color(RED, true, "Logger: exception thrown by ByteArrayInputStream -- this should not happen")); } @@ -134,6 +135,7 @@ public class Log { while(str.indexOf('\n') != -1) { System.err.println(classname + color(levelcolor, bright, str.substring(0, str.indexOf('\n')))); classname = logDates ? " " : " "; + classname = color(GRAY,false,classname); str = str.substring(str.indexOf('\n') + 1); } System.err.println(classname + color(levelcolor, bright, str));