X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=7572beb0dfaf03aaf6b013fb7833e5aa16b7426e;hb=ea8d7a51a7c20e9fccacdd7d16b9a3e55a6bd8e3;hp=df1cfd60a3592e7ce5b74884d8ece82723356573;hpb=ef61babe77a94eba181c95a52c0069a612276dff;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index df1cfd6..7572beb 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -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 } @@ -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,14 +813,14 @@ 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) 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); } }