X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=13717cf2852a79aa794133524c30a96b9fb1b29b;hb=fd4126d20d5d33fb5e122d76616a439f7177cd03;hp=d6bb5f5a5e32e51d845a47201931ad1d95abbdc5;hpb=9eabd23874c2a15ad603f3e671245237d1ee7ec0;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index d6bb5f5..13717cf 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -68,10 +68,11 @@ 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; } + // FIXME update these // box properties can not be trapped static final String[] props = new String[] { "fill", "stroke", "image", "tile", "fixedaspect", "text", "path", "font", @@ -82,6 +83,7 @@ public final class Box extends JSScope implements Scheduler.Task { "mouseinside", "root", "thisbox", "indexof" }; + // FIXME update these // events can have write traps, but not read traps static final String[] events = new String[] { "Press1", "Press2", "Press3", @@ -90,9 +92,7 @@ public final class Box extends JSScope implements Scheduler.Task { "DoubleClick1", "DoubleClick2", "DoubleClick3", "Enter", "Leave", "Move", "KeyPressed", "KeyReleased", "PosChange", "SizeChange", - "childadded", "childremoved", - "Focused", "Maximized", "Minimized", "Close", "icon", "titlebar", "toback", "tofront" }; @@ -121,22 +121,25 @@ public final class Box extends JSScope implements Scheduler.Task { static final int ALIGN_RIGHT = 0x00008000; static final int ALIGNS = 0x0000f000; static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues? - static final int NOCLIP = 0x00020000; + static final int CLIP = 0x00020000; + static final int STOP_UPWARD_PROPAGATION = 0x00040000; // Instance Data ////////////////////////////////////////////////////////////////////// Box parent = null; Box redirect = this; - int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */; + int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP; private String text = null; private Font font = DEFAULT_FONT; - private Picture texture; + private Picture texture = null; private short strokewidth = 1; - private int fillcolor = 0x00000000; + public int fillcolor = 0x00000000; private int strokecolor = 0xFF000000; + private int aspect = 0; + // specified directly by user public LENGTH minwidth = 0; public LENGTH maxwidth = MAX_LENGTH; @@ -168,7 +171,15 @@ public final class Box extends JSScope implements Scheduler.Task { /** invoked when a resource needed to render ourselves finishes loading */ - public void perform() { + public void perform() throws JSExn { + + // FIXME; we can't assume that just because we were performed the image is loaded. + // as external events have occured, check the state of box + if (texture != null) { + if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); } + else { Res res = texture.res; texture = null; throw new JSExn("image not found: "+res); } + } + MARK_REPACK; MARK_REFLOW; MARK_RESIZE; @@ -183,7 +194,8 @@ public final class Box extends JSScope implements Scheduler.Task { public void dirty() { dirty(0, 0, width, height); } public void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.parent) { - if (!cur.test(NOCLIP)) { + // x and y have a different meaning on the root box + if (cur.parent != null && cur.test(CLIP)) { w = min(x + w, cur.width) - max(x, 0); h = min(y + h, cur.height) - max(y, 0); x = max(x, 0); @@ -196,25 +208,6 @@ public final class Box extends JSScope implements Scheduler.Task { } } - /** update MOUSEINSIDE, check for Enter/Leave/Move */ - void Move(int oldmousex, int oldmousey, int mousex, int mousey) { Move(oldmousex, oldmousey, mousex, mousey, false); } - void Move(int oldmousex, int oldmousey, int mousex, int mousey, boolean forceleave) { - boolean wasinside = test(MOUSEINSIDE); - boolean isinside = test(VISIBLE) && inside(mousex, mousey) && !forceleave; - if (isinside) set(MOUSEINSIDE); else clear(MOUSEINSIDE); - if (!wasinside && !isinside) return; - - if (isinside && test(CURSOR)) Surface.fromBox(getRoot()).cursor = (String)boxToCursor.get(this); - if (!wasinside && isinside && getTrap("Enter") != null) putAndTriggerTrapsAndCatchExceptions("Enter", T); - else if (wasinside && !isinside && getTrap("Leave") != null) putAndTriggerTrapsAndCatchExceptions("Leave", T); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && getTrap("Move")!= null) - putAndTriggerTrapsAndCatchExceptions("Move", T); - for(Box b = getChild(treeSize() - 1); b != null; b = b.prevSibling()) { - b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave); - if (b.inside(mousex - b.x, mousey - b.y)) forceleave = true; - } - } - // Reflow //////////////////////////////////////////////////////////////////////////////////////// @@ -263,17 +256,30 @@ public final class Box extends JSScope implements Scheduler.Task { } void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { - // FEATURE reimplement, but we're destroying this - // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345 - //if (x != this.x || y != this.y || width != this.width || height != this.height) { - (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height); + if (x != this.x || y != this.y || width != this.width || height != this.height) { boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null; boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; + do { + int thisx = parent == null ? 0 : this.x; + int thisy = parent == null ? 0 : this.y; + if (texture == null && (text == null || text.equals(""))) { + if ((fillcolor & 0xff000000) == 0) break; + // FEATURE: more optimizations here + if (this.x == x && this.y == y) { + Box who = (parent == null ? this : parent); + who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height)); + who.dirty(thisx, thisy+min(this.height,height), min(this.width, width), Math.abs(height-this.height)); + break; + } + } + (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height); + this.width = width; this.height = height; this.x = x; this.y = y; + dirty(); + } while (false); this.width = width; this.height = height; this.x = x; this.y = y; - dirty(); if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T); if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T); - //} + } } void resize_children() { @@ -350,7 +356,8 @@ public final class Box extends JSScope implements Scheduler.Task { int globaly = parenty + (parent == null ? 0 : y); // intersect the x,y,w,h rendering window with ourselves; quit if it's empty - if (!test(NOCLIP)) { + + if (test(CLIP)) { cx1 = max(cx1, parent == null ? 0 : globalx); cy1 = max(cy1, parent == null ? 0 : globaly); cx2 = min(cx2, globalx + width); @@ -358,9 +365,10 @@ public final class Box extends JSScope implements Scheduler.Task { if (cx2 <= cx1 || cy2 <= cy1) return; } - if ((fillcolor & 0xFF000000) != 0x00000000) - buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor); + if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null) + buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : fillcolor); + // FIXME: do aspect in here if (texture != null && texture.isLoaded) for(int x = globalx; x < cx2; x += texture.width) for(int y = globaly; y < cy2; y += texture.height) @@ -411,6 +419,7 @@ public final class Box extends JSScope implements Scheduler.Task { return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name); //#switch(name) + case "surface": return parent == null ? null : parent.get("surface"); case "indexof": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); @@ -425,6 +434,7 @@ public final class Box extends JSScope implements Scheduler.Task { case "shrink": return B(test(HSHRINK) || test(VSHRINK)); case "hshrink": return B(test(HSHRINK)); case "vshrink": return B(test(VSHRINK)); + case "aspect": return N(aspect); case "x": return (parent == null || !test(VISIBLE)) ? N(0) : N(x); case "y": return (parent == null || !test(VISIBLE)) ? N(0) : N(y); case "width": return N(width); @@ -433,15 +443,17 @@ public final class Box extends JSScope implements Scheduler.Task { case "rows": return test(FIXED) == ROWS ? N(rows) : N(0); case "colspan": return N(colspan); case "rowspan": return N(rowspan); - case "noclip": return B(test(NOCLIP)); + case "clip": return B(test(CLIP)); case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T))); case "packed": return B(test(PACKED)); case "globalx": return N(localToGlobalX(0)); case "globaly": return N(localToGlobalY(0)); case "cursor": return test(CURSOR) ? boxToCursor.get(this) : null; - case "mousex": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalX(s.mousex)); } - case "mousey": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalY(s.mousey)); } - case "mouseinside": return B(test(MOUSEINSIDE)); + case "mouse": + if (getSurface() == null) return null; + if (getSurface()._mousex == Integer.MAX_VALUE) + throw new JSExn("you cannot read from the box.mouse property in background thread context"); + return new Mouse(); case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren"); case "minwidth": return N(minwidth); case "maxwidth": return N(maxwidth); @@ -454,8 +466,27 @@ public final class Box extends JSScope implements Scheduler.Task { throw new Error("unreachable"); // unreachable } - void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); } - void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); } + private class Mouse extends JS { + public Object get(Object key) { + //#switch(key) + case "x": return N(globalToLocalX(getSurface()._mousex)); + case "y": return N(globalToLocalY(getSurface()._mousey)); + + // this might not get recomputed if we change mousex/mousey... + case "inside": return B(MOUSEINSIDE); + //#end + return null; + } + } + + void setMaxWidth(Object value) { + do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); + if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; + } + void setMaxHeight(Object value) { + do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); + if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight; + } public void put(Object name, Object value) throws JSExn { if (name instanceof Number) { put(toInt(name), value); return; } @@ -478,44 +509,73 @@ public final class Box extends JSScope implements Scheduler.Task { case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent; case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK; case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK; - case "noclip": CHECKSET_FLAG(NOCLIP); if (parent == null) dirty(); else parent.dirty(); + case "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty(); case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty(); case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent; + case "aspect": CHECKSET_INT(aspect); dirty(); case "globalx": put("x", N(globalToLocalX(toInt(value)))); case "globaly": put("y", N(globalToLocalY(toInt(value)))); case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); MARK_RESIZE; case "cursor": setCursor(value); case "fill": setFill(value); - case "Press1": mouseEvent("Press1", value); - case "Press2": mouseEvent("Press2", value); - case "Press3": mouseEvent("Press3", value); - case "Release1": mouseEvent("Release1", value); - case "Release2": mouseEvent("Release2", value); - case "Release3": mouseEvent("Release3", value); - case "Click1": mouseEvent("Click1", value); - case "Click2": mouseEvent("Click2", value); - case "Click3": mouseEvent("Click3", value); - case "DoubleClick1": mouseEvent("DoubleClick1", value); - case "DoubleClick2": mouseEvent("DoubleClick2", value); - case "DoubleClick3": mouseEvent("DoubleClick3", value); + case "mouse": + int mousex = toInt(((JS)value).get("x")); + int mousey = toInt(((JS)value).get("y")); + getSurface()._mousex = localToGlobalX(mousex); + getSurface()._mousey = localToGlobalY(mousey); case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value); // FEATURE case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE 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(); } case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); } - case "KeyPressed": return; // prevent stuff from hitting the Hash - case "KeyReleased": return; // prevent stuff from hitting the Hash - case "PosChange": return; // prevent stuff from hitting the Hash - case "SizeChange": return; // prevent stuff from hitting the Hash - case "childadded": return; // prevent stuff from hitting the Hash - case "childremoved": return; // prevent stuff from hitting the Hash - case "thisbox": if (value == null) removeSelf(); - default: super.put(name, value); + + case "Press1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Press2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Press3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "KeyPressed": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "KeyReleased": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Move": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Enter": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Leave": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + + case "_Move": propagateDownward(name, value, false); + case "_Press1": propagateDownward(name, value, false); + case "_Press2": propagateDownward(name, value, false); + case "_Press3": propagateDownward(name, value, false); + case "_Release1": propagateDownward(name, value, false); + case "_Release2": propagateDownward(name, value, false); + case "_Release3": propagateDownward(name, value, false); + case "_Click1": propagateDownward(name, value, false); + case "_Click2": propagateDownward(name, value, false); + case "_Click3": propagateDownward(name, value, false); + case "_DoubleClick1": propagateDownward(name, value, false); + case "_DoubleClick2": propagateDownward(name, value, false); + case "_DoubleClick3": propagateDownward(name, value, false); + case "_KeyPressed": propagateDownward(name, value, false); + case "_KeyReleased": propagateDownward(name, value, false); + + case "PosChange": return; + case "SizeChange": return; + case "childadded": return; + case "childremoved": return; + + case "thisbox": if (value == null) removeSelf(); + + default: super.put(name, value); //#end } @@ -545,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 } @@ -556,7 +616,8 @@ public final class Box extends JSScope implements Scheduler.Task { boxToCursor.put(this, value); Surface surface = getSurface(); String tempcursor = surface.cursor; - Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); + // FIXME + //Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); if (surface.cursor != tempcursor) surface.syncCursor(); } @@ -571,37 +632,49 @@ public final class Box extends JSScope implements Scheduler.Task { return; } if (!(value instanceof Res)) return; - - - // FIXME texture = Picture.load((Res)value, this); - if (texture.isLoaded) { - minwidth = texture.width; - minheight = texture.height; - MARK_REFLOW; - dirty(); - return; - } - texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() { - // FIXME pass this instead of a new Task? - minwidth = texture.width; - minheight = texture.height; - Box b = Box.this; MARK_REFLOW_b; - dirty(); - } }); } - - private void mouseEvent(String name, Object value) { - Surface surface = getSurface(); - if (surface == null) return; - int mousex = globalToLocalX(surface.mousex); - int mousey = globalToLocalY(surface.mousey); - for(Box c = prevSibling(); c != null; c = c.prevSibling()) - if (c.inside(mousex - c.x, mousey - c.y)) { c.putAndTriggerTrapsAndCatchExceptions(name, value); return; } - if (parent != null) parent.putAndTriggerTrapsAndCatchExceptions(name, value); + + // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down + /** + * Handles events which propagate down the box tree. If obscured + * is set, then we merely check for Enter/Leave. + */ + private void propagateDownward(Object name_, Object value, boolean obscured) { + + String name = (String)name_; + if (getSurface() == null) return; + int x = globalToLocalX(getSurface()._mousex); + int y = globalToLocalY(getSurface()._mousey); + boolean wasinside = test(MOUSEINSIDE); + boolean isinside = test(VISIBLE) && inside(x, y) && !obscured; + if (!wasinside && isinside) { set(MOUSEINSIDE); putAndTriggerTrapsAndCatchExceptions("Enter", T); } + if (wasinside && !isinside) { clear(MOUSEINSIDE); putAndTriggerTrapsAndCatchExceptions("Leave", T); } + + boolean found = false; + if (wasinside || isinside) + for(Box child = getChild(treeSize() - 1); child != null; child = child.prevSibling()) { + boolean save_stop = child.test(STOP_UPWARD_PROPAGATION); + if (obscured || !child.inside(x - child.x, y - child.y)) { + child.propagateDownward(name, value, true); + } else try { + found = true; + child.clear(STOP_UPWARD_PROPAGATION); + child.putAndTriggerTrapsAndCatchExceptions(name, value); + } finally { + if (save_stop) child.set(STOP_UPWARD_PROPAGATION); else child.clear(STOP_UPWARD_PROPAGATION); + } + if (child.inside(x - child.x, y - child.y)) + if (name.equals("_Move")) obscured = true; + else break; + } + + if (!obscured && !found) + if (!name.equals("_Move") || wasinside) putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); } private static int stringToColor(String s) { + // FIXME support three-char strings by doubling digits if (s == null) return 0x00000000; else if (SVG.colors.get(s) != null) return 0xFF000000 | toInt(SVG.colors.get(s)); else if (s.length() > 0 && s.charAt(0) == '#') try { @@ -611,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? @@ -712,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); @@ -740,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; } @@ -765,12 +838,12 @@ public final class Box extends JSScope implements Scheduler.Task { } } - private void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { + void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { 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); } }