fix bug 442

[org.ibex.core.git] / src / org / ibex / util / Log.java

diff --git a/src/org/ibex/util/Log.java b/src/org/ibex/util/Log.java
index 04fc7c1..d031dc7 100644 (file)
--- a/src/org/ibex/util/Log.java
+++ b/src/org/ibex/util/Log.java
@@ -40,7 +40,6 @@ public class Log {
     private static final int WARN = 2;
     private static final int ERROR = 3;
 
-    private static final int BLACK = 30;
     private static final int BLUE = 34;
     private static final int GREEN = 32;
     private static final int CYAN = 36;
@@ -72,14 +71,16 @@ public class Log {
         }
 
         String classname;
-        if (o instanceof Class) classname = ((Class)o).getName();
+        if (o instanceof Class) {
+            classname = ((Class)o).getName();
+            if (classname.indexOf('.') != -1) classname = classname.substring(classname.lastIndexOf('.') + 1);
+        }
         else if (o instanceof String) classname = (String)o;
         else classname = o.getClass().getName();
 
         if (classname.equals(lastClassName)) classname = "";
         else lastClassName = classname;
         
-        if (classname.indexOf('.') != -1) classname = classname.substring(classname.lastIndexOf('.') + 1);
         if (classname.length() > (logDates ? 14 : 20)) classname = classname.substring(0, (logDates ? 14 : 20));
         while (classname.length() < (logDates ? 14 : 20)) classname = " " + classname;
         classname = classname + (classname.trim().length() == 0 ? "  " : ": ");