2003/12/29 18:05:53

[org.ibex.core.git] / src / org / xwt / Box.java

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 9dbd0ab..7572beb 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -68,7 +68,7 @@ public final class Box extends JSScope implements Scheduler.Task {
     static {
         Font f = null;
         try { f = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); }
-        catch(JSExn e) { Log.log(Box.class, "should never happen: "+e); }
+        catch(JSExn e) { Log.info(Box.class, "should never happen: "+e); }
         DEFAULT_FONT = f;
     }
 
@@ -528,7 +528,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true);
         case "toback": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toBack(); }
         case "tofront": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toFront(); }
-        case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once");
+        case "redirect": if (redirect == this) redirect = (Box)value; else Log.info(this, "redirect can only be set once");
         case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty();
         case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
         case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
@@ -605,7 +605,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         case "bottom": set(ALIGN_BOTTOM);
         case "left": set(ALIGN_LEFT);
         case "right": set(ALIGN_RIGHT);
-        default: Log.logJS("invalid alignment \"" + value + "\"");
+        default: JS.log("invalid alignment \"" + value + "\"");
         //#end
     }
     
@@ -684,7 +684,7 @@ public final class Box extends JSScope implements Scheduler.Task {
                 (Integer.parseInt(s.substring(3, 5), 16) << 8) |
                 Integer.parseInt(s.substring(5, 7), 16);
         } catch (NumberFormatException e) {
-            Log.log(Box.class, "invalid color " + s);
+            Log.info(Box.class, "invalid color " + s);
             return 0;
         }
         else return 0; // FEATURE: error?
@@ -785,13 +785,13 @@ public final class Box extends JSScope implements Scheduler.Task {
         if (i < 0) return;
             
         if (value != null && !(value instanceof Box)) {
-            if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+            if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box");
             return;
         }
 
         if (redirect == null) {
             if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
-            else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+            else JS.log(this, "attempt to add/remove children to/from a node with a null redirect");
 
         } else if (redirect != this) {
             if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
@@ -813,15 +813,15 @@ public final class Box extends JSScope implements Scheduler.Task {
             // check if box being moved is currently target of a redirect
             for(Box cur = b.parent; cur != null; cur = cur.parent)
                 if (cur.redirect == b) {
-                    if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+                    if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect");
                     return;
                 }
 
             // check for recursive ancestor violation
             for(Box cur = this; cur != null; cur = cur.parent)
                 if (cur == b) {
-                    if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
-                    if (Log.on) Log.log(this, "box == " + this + "  ancestor == " + b);
+                    if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor");
+                    if (Log.on) Log.info(this, "box == " + this + "  ancestor == " + b);
                     return;
                 }
 
@@ -842,8 +842,8 @@ public final class Box extends JSScope implements Scheduler.Task {
         try {
             putAndTriggerTraps(name, val);
         } catch (Exception e) {
-            Log.logJS("caught exception while putting to trap \""+name+"\"");
-            Log.logJS(e);
+            JS.log("caught exception while putting to trap \""+name+"\"");
+            JS.log(e);
         }
     }