fix bug 442

This fixes bug 442 (which was marked a dup of a more generic bug). Log.java was incorrectly stripping off everything before the period even when it was passed a String (filename) in addition to when it was passed a class.

darcs-hash:20040210022145-a9258-38b05f57db1f030ad8ef6ff997273adda2a15ccc.gz

diff --git a/src/org/ibex/util/Log.java b/src/org/ibex/util/Log.java
index e90b774..d031dc7 100644 (file)
--- a/src/org/ibex/util/Log.java
+++ b/src/org/ibex/util/Log.java
@@ -71,14 +71,16 @@ public class Log {
         }
 
         String classname;
         }
 
         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;
         
         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 ? "  " : ": ");
         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 ? "  " : ": ");