X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=f04c3c2bc07b8d4453723565bf550f7289433f9b;hb=a5badea1a13725a5ab1294c9b2e6ac9ea8be82c1;hp=738d102e1d2014ca157aee934074c245496581b8;hpb=9284df0499837f50eeb6d891ca3c67c085ac7fdd;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 738d102..f04c3c2 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -374,20 +374,20 @@ public final class Box extends JS.Scope { /** returns the actual font that should be used to render this box */ private String font() { - if (font != null) return font; - if (font == null && cachedFont != null) return cachedFont; - if (getParent() != null) return cachedFont = getParent().font(); - return cachedFont = Platform.getDefaultFont(); + if (font != null) return font; + if (font == null && cachedFont != null) return cachedFont; + if (getParent() != null) return cachedFont = getParent().font(); + return cachedFont = Platform.getDefaultFont(); } /** this must be called when a box's font changes */ void fontChanged() { - textupdate(); - for(Box b = getChild(0); b != null; b = b.nextSibling()) - if (b.font == null) { - b.cachedFont = font(); - b.fontChanged(); - } + textupdate(); + for(Box b = getChild(0); b != null; b = b.nextSibling()) + if (b.font == null) { + b.cachedFont = font(); + b.fontChanged(); + } } /** This must be called when font or text is changed */ @@ -429,20 +429,20 @@ public final class Box extends JS.Scope { if (str.indexOf(':') == -1) { String s = str; byte[] b = Resources.getResource(Resources.resolve(s + ".png", null)); - if (b != null) return PNG.decode(new ByteArrayInputStream(b), str); + if (b != null) return PNG.decode(new ByteArrayInputStream(b), str); b = Resources.getResource(Resources.resolve(s + ".jpeg", null)); - if (b != null) return Platform.decodeJPEG(new ByteArrayInputStream(b), str); - return null; + if (b != null) return Platform.decodeJPEG(new ByteArrayInputStream(b), str); + return null; } else { - Thread thread = Thread.currentThread(); + java.lang.Thread thread = java.lang.Thread.currentThread(); if (!(thread instanceof ThreadMessage)) { if (Log.on) Log.log(Box.class, "HTTP images can not be loaded from the foreground thread"); return null; } // FIXME: use primitives here ThreadMessage mythread = (ThreadMessage)thread; - mythread.setPriority(Thread.MIN_PRIORITY); + mythread.setPriority(java.lang.Thread.MIN_PRIORITY); mythread.done.release(); try { HTTP http = new HTTP(str); @@ -463,10 +463,10 @@ public final class Box extends JS.Scope { ThreadMessage.newthread(new JS.Callable() { public Object call(JS.Array args_) throws JS.Exn { try { - JS.Array args = new JS.Array(); - args.addElement(new Double(bytesDownloaded)); - args.addElement(new Double(contentLength)); - callback.call(args); + JS.Array args = new JS.Array(); + args.addElement(new Double(bytesDownloaded)); + args.addElement(new Double(contentLength)); + callback.call(args); } finally { clear = true; } @@ -480,7 +480,7 @@ public final class Box extends JS.Scope { if (str.endsWith(".gif")) return GIF.decode(is, str); else if (str.endsWith(".jpeg") || str.endsWith(".jpg")) return Platform.decodeJPEG(is, str); - else return PNG.decode(is, str); + else return PNG.decode(is, str); } catch (IOException e) { if (Log.on) Log.log(Box.class, "error while trying to load an image from " + str); @@ -489,7 +489,7 @@ public final class Box extends JS.Scope { } finally { MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); + mythread.setPriority(java.lang.Thread.NORM_PRIORITY); mythread.go.block(); } } @@ -518,9 +518,9 @@ public final class Box extends JS.Scope { } else { image = getPicture(s); if (image == null) { - if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " + Context.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(Box.class, "unable to load image " + s); return; - } + } if (sizetoimage) syncSizeToImage(); dirty(); } @@ -539,7 +539,7 @@ public final class Box extends JS.Scope { 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.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "unable to load border image " + s); return; } int[] data = id.getData(); @@ -740,15 +740,14 @@ public final class Box extends JS.Scope { 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.getCurrentSourceNameAndLine()); - /* + if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); + /* try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); InterpretedJS.Callable f = (InterpretedJS.Callable)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", Boolean.TRUE); @@ -1072,13 +1071,12 @@ public final class Box extends JS.Scope { * WARNING: O(n) runtime, unless i == numChildren() */ public void put(int i, Object value) { - if (i < 0) return; + if (i < 0) return; 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.getCurrentSourceNameAndLine()); - + if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to anything other than a box"); } 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.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect"); } else if (redirect != this) { Box b = value == null ? (Box)redirect.get(i) : (Box)value; redirect.put(i, value); @@ -1092,7 +1090,7 @@ public final class Box extends JS.Scope { } } else if (value instanceof RootProxy) { - if (Log.on) Log.log(this, "attempt to reparent a box via its proxy object at " + Context.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "attempt to reparent a box via its proxy object"); } else { Box newnode = (Box)value; @@ -1100,16 +1098,14 @@ public final class Box extends JS.Scope { // check if box being moved is currently target of a redirect 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.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(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.getParent()) if (cur == newnode) { - if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " + - Context.getCurrentSourceNameAndLine()); + 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 == " + newnode); return; } @@ -1165,9 +1161,10 @@ public final class Box extends JS.Scope { 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()); + if (name_ instanceof Number) return get(((Number)name_).intValue()); - String name = (String)name_; + if (!(name_ instanceof String)) return null; + String name = (String)name_; if (name.equals("")) return null; // See if we're reading back the function value of a trap @@ -1188,8 +1185,7 @@ public final class Box extends JS.Scope { 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.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found"); return ret; } @@ -1207,19 +1203,20 @@ public final class Box extends JS.Scope { public void put(Object name, Object value) { put(name, value, false, null); } public void put(Object name, Object value, boolean ignoretraps) { put(name, value, ignoretraps, null); } public void put(Object name_, Object value, boolean ignoretraps, RootProxy rp) { - if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; } - String name = (String)name_; - if (name == null) return; // FIXME, shouldn't be necessary + if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; } + if (!(name_ instanceof String)) { super.put(name_,value); return; } + String name = name_.toString(); + if (name == null) return; // FIXME, shouldn't be necessary if (name.startsWith("xwt_")) { - if (Log.on) Log.log(this, "attempt to set reserved property " + name + " at " + Context.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "attempt to set reserved property " + name); return; - } + } if (!ignoretraps && traps != null) { Trap t = (Trap)traps.get(name); if (t != null) { JS.Array arg = new JS.Array(); - arg.addElement(value); + arg.addElement(value); t.perform(arg); arg.setElementAt(null, 0); return; @@ -1237,11 +1234,9 @@ public final class Box extends JS.Scope { if (name.charAt(0) == '_') { if (value != null && !(value instanceof JS.Callable)) { - if (Log.on) Log.log(this, "attempt to put a non function value (" + value + ") to " + - name + " at " + Context.getCurrentSourceNameAndLine()); - } else if (value != null && !(value instanceof JS.CompiledFunction)) { - if (Log.on) Log.log(this, "attempt to put a non-compiled function value (" + value + ") to " + - name + " at " + Context.getCurrentSourceNameAndLine()); + if (Log.on) Log.logJS(this, "attempt to put a non function value (" + value + ") to " + name); + } else if (value != null && !(value instanceof JS.CompiledFunction)) { + if (Log.on) Log.logJS(this, "attempt to put a non-compiled function value (" + value + ") to " + name); } else if (name.charAt(1) == '_') { name = name.substring(2).intern(); Trap t = Trap.getTrap(this, name); @@ -1256,7 +1251,7 @@ public final class Box extends JS.Scope { return; } - super.put(name, value); + super.put(name, value); // a bit of a hack, since titlebar is the only 'special' property stored in JSObject if (getParent() == null && surface != null) { @@ -1299,7 +1294,7 @@ public final class Box extends JS.Scope { /** remove this node from its parent; INVARIANT: whenever the parent of a node is changed, remove() gets called. */ public void remove() { - cachedFont = null; + cachedFont = null; if (parent == null) { if (surface != null) surface.dispose(true); return; @@ -1423,6 +1418,9 @@ public final class Box extends JS.Scope { public Object get(Object name) { return box.get(name); } public void put(Object name, Object value) { box.put(name, value, false, this); } public Object[] keys() { return box.keys(); } + public Object callMethod(Object method, JS.Array args, boolean justChecking) { + return box.callMethod(method,args,justChecking); + } } @@ -1508,7 +1506,11 @@ public final class Box extends JS.Scope { return this; } + // This is the name returned by typeof() by JS + public String typeName() { + return "box"; + } + } -