@@ -82,7 +82,7 @@ import org.mozilla.javascript.*; * uses x1,y1,x2,y2 tuples. *
*/ -public final class Box extends JSObject { +public final class Box extends JS.Scope { // Static Data ////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ public final class Box extends JSObject { static Hash imageToNameMap = new Hash(); /** the empty object, used for get-traps */ - private static Object[] emptyobj = new Object[] { }; + private static JS.Array emptyobj = new JS.Array(); // Instance Data: Templates //////////////////////////////////////////////////////// @@ -263,22 +263,18 @@ public final class Box extends JSObject { // Instance Data: IndexOf //////////////////////////////////////////////////////////// /** The indexof() Function; created lazily */ - public Function indexof = null; - public Function indexof() { - if (indexof == null) indexof = new IndexOf(); - return indexof; - } + public JS.Function indexof = null; + public JS.Function indexof() { if (indexof == null) indexof = new IndexOf(); return indexof; } /** a trivial private class to serve as the box.indexof function object */ - private class IndexOf extends JSObject implements Function { + private class IndexOf extends JS.Function { public IndexOf() { this.setSeal(true); } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - public Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException { - if (args == null || args.length != 1 || args[0] == null || !(args[0] instanceof Box)) return new Integer(-1); - Box b = (Box)args[0]; + public Object _call(JS.Array args) throws JS.Exn { + if (args.length() != 1 || args.elementAt(0) == null || !(args.elementAt(0) instanceof Box)) return new Integer(-1); + Box b = (Box)args.elementAt(0); if (b.getParent() != Box.this) { if (redirect == null || redirect == Box.this) return new Integer(-1); - return Box.this.redirect.indexof().call(cx, scope, thisObj, args); + return Box.this.redirect.indexof().call(args); } return new Integer(b.getIndexInParent()); } @@ -464,11 +460,13 @@ public final class Box extends JSObject { if (ret != -1) bytesDownloaded += ret; if (clear && callback != null) { clear = false; - ThreadMessage.newthread(new JSObject.JSFunction() { - public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException { + ThreadMessage.newthread(new JS.Function() { + public Object _call(JS.Array args_) throws JS.Exn { try { - callback.call(cx, null, null, new Object[] { - new Double(bytesDownloaded), new Double(contentLength) }); + JS.Array args = new JS.Array(); + args.addElement(new Double(bytesDownloaded)); + args.addElement(new Double(contentLength)); + callback.call(args); } finally { clear = true; } @@ -520,8 +518,7 @@ public final class Box extends JSObject { } else { image = getPicture(s); if (image == null) { - if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " + JS.getCurrentFunctionSourceName()); return; } if (sizetoimage) syncSizeToImage(); @@ -542,8 +539,7 @@ public final class Box extends JSObject { if (border == null) { ImageDecoder id = getImage(s, null); if (id == null) { - if (Log.on) Log.log(this, "unable to load border image " + s + " at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(this, "unable to load border image " + s + " at " + JS.getCurrentFunctionSourceName()); return; } int[] data = id.getData(); @@ -588,21 +584,10 @@ public final class Box extends JSObject { } /** returns true if the property has a trap on it */ - boolean is_trapped(String property) { - if (traps == null) { - return false; - } else { - Object gc = traps.get(property); - return (gc != null && - !(gc instanceof org.mozilla.javascript.Undefined) && - gc != org.mozilla.javascript.Scriptable.NOT_FOUND); - } - } + boolean is_trapped(String property) { return traps != null && traps.get(property) != null; } /** Adds the node's current actual geometry to the Surface's dirty list */ - void dirty() { - dirty(pos(0), pos(1), size(0), size(1)); - } + void dirty() { dirty(pos(0), pos(1), size(0), size(1)); } /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ public final void dirty(int x, int y, int w, int h) { @@ -632,9 +617,9 @@ public final class Box extends JSObject { if (!wasinside && !isinside) return; - if (!wasinside && isinside && is_trapped("Enter")) put("Enter", null, this); - else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", null, this); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", null, this); + if (!wasinside && isinside && is_trapped("Enter")) put("Enter", this); + else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", this); + else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", this); if (isinside && cursor != null && surface != null) surface.cursor = cursor; @@ -650,7 +635,7 @@ public final class Box extends JSObject { /** creates a new box from an anonymous template; ids is passed through to Template.apply() */ Box(Template anonymous, Vec pboxes, Vec ptemplates, Function callback, int numerator, int denominator) { - super(true); + super(null); set(dmax, 0, Integer.MAX_VALUE); set(dmax, 1, Integer.MAX_VALUE); template = anonymous; @@ -662,7 +647,7 @@ public final class Box extends JSObject { /** creates a new box from an unresolved templatename and an importlist; use "box" for an untemplatized box */ public Box(String templatename, String[] importlist) { this(templatename, importlist, null); } public Box(String templatename, String[] importlist, Function callback) { - super(true); + super(null); set(dmax, 0, Integer.MAX_VALUE); set(dmax, 1, Integer.MAX_VALUE); this.importlist = importlist; @@ -756,16 +741,18 @@ public final class Box extends JSObject { if (++surface.sizePosChangesSinceLastRender >= 500) { if (surface.sizePosChangesSinceLastRender == 500) { if (Log.on) Log.log(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); - if (Log.on) Log.log(this, " interpreter is at " + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(this, " interpreter is at " + JS.getCurrentFunctionSourceName()); + /* try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); InterpretedFunction f = (InterpretedFunction)t.f; if (Log.on) Log.log(this, "Current trap is at " + f.getSourceName() + ":" + f.getLineNumbers()[0]); } catch (Throwable t) { } + */ } } else { - if (sizechange) put("SizeChange", null, Boolean.TRUE); - if (poschange) put("PosChange", null, Boolean.TRUE); + if (sizechange) put("SizeChange", Boolean.TRUE); + if (poschange) put("PosChange", Boolean.TRUE); if (sizechange || poschange) { surface.abort = true; return; @@ -1072,9 +1059,9 @@ public final class Box extends JSObject { // Methods to implement org.mozilla.javascript.Scriptable ////////////////////////////////////// /** Returns the i_th child */ - public Object get(int i, Scriptable start) { + public Object get(int i) { if (redirect == null) return null; - if (redirect != this) return redirect.get(i, start); + if (redirect != this) return redirect.get(i); return i >= numChildren() ? null : getChild(i); } @@ -1084,31 +1071,27 @@ public final class Box extends JSObject { * INVARIANT: after completion, getChild(min(i, numChildren())) == newnode * WARNING: O(n) runtime, unless i == numChildren() */ - public void put(int i, Scriptable start, Object value) { + public void put(int i, Object value) { if (value != null && !(value instanceof Box)) { - if (Log.on) Log.log(this, "attempt to set a numerical property on a box to anything other than a box at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(this, "attempt to set a numerical property on a box to anything other than a box at " + JS.getCurrentFunctionSourceName()); } else if (redirect == null) { - if (Log.on) Log.log(this, "attempt to add/remove children to/from a node with a null redirect at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); - + if (Log.on) Log.log(this, "attempt to add/remove children to/from a node with a null redirect at " + JS.getCurrentFunctionSourceName()); } else if (redirect != this) { - Box b = value == null ? (Box)redirect.get(i, null) : (Box)value; - redirect.put(i, null, value); - put("0", null, b); + Box b = value == null ? (Box)redirect.get(i) : (Box)value; + redirect.put(i, value); + put("0", b); } else if (value == null) { if (i >= 0 && i < numChildren()) { Box b = getChild(i); b.remove(); - put("0", null, b); + put("0", b); } } else if (value instanceof RootProxy) { - if (Log.on) Log.log(this, "attempt to reparent a box via its proxy object at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(this, "attempt to reparent a box via its proxy object at " + JS.getCurrentFunctionSourceName()); } else { Box newnode = (Box)value; @@ -1117,15 +1100,16 @@ public final class Box extends JSObject { for(Box cur = newnode.getParent(); cur != null; cur = cur.getParent()) if (cur.redirect == newnode) { if (Log.on) Log.log(this, "attempt to move a box that is the target of a redirect at "+ - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + JS.getCurrentFunctionSourceName()); return; } // check for recursive ancestor violation for(Box cur = this; cur != null; cur = cur.getParent()) if (cur == newnode) { - if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " + + JS.getCurrentFunctionSourceName()); + if (Log.on) Log.log(this, "box == " + this + " ancestor == " + newnode); return; } @@ -1174,21 +1158,16 @@ public final class Box extends JSObject { sync_cmin_to_children(); // note that JavaScript box[0] will invoke put(int i), not put(String s) - put("0", null, newnode); + put("0", newnode); } } - public Object get(String name, Scriptable start) { return get(name, start, false); } - public Object get(String name, Scriptable start, boolean ignoretraps) { - - if (name == null || name.equals("")) return null; + public Object get(Object name) { return get(name, false); } + public Object get(Object name_, boolean ignoretraps) { + if (name_ instanceof Number) return get(((Number)name_).intValue()); - // hack since Rhino needs to be able to grab these functions to create new objects - if (name.equals("Object")) return JSObject.defaultObjects.get("Object", null); - if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null); - if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null); - if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null); - if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null); + String name = (String)name_; + if (name.equals("")) return null; // See if we're reading back the function value of a trap if (name.charAt(0) == '_') { @@ -1206,55 +1185,42 @@ public final class Box extends JSObject { SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name); if (gph != null) return gph.get(this); - Object ret = super.get(name, start); + Object ret = super.get(name); if (name.startsWith("$") && ret == null) if (Log.on) Log.log(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found; " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + JS.getFileAndLine()); return ret; } - /** indicate that we don't want JSObject trying to handle these */ - public boolean has(String name, Scriptable start) { - if (name.equals("")) return false; - if (traps != null && traps.get(name) != null) return true; - if (name.charAt(0) == '_') return true; - if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true; - if (name.equals("Function") || name.equals("Array") || name.equals("Object") || - name.equals("TypeError") || name.equals("ConversionError")) return true; - return super.has(name, start); - } - - public Object[] getIds() { + public Object[] keys() { Object[] ret = new Object[numChildren()]; - for(int i=0; i