2002/08/16 23:40:42

darcs-hash:20040130065008-2ba56-73f2de8cbec2938de3611b9ff2bb01d38d6a2f98.gz

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index ea3060a..6302f49 100644 (file)
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -657,6 +657,11 @@ class SpecialBoxProperty {
                     return get(b.redirect);
                 }
             });
+
+        specialBoxProperties.put("apply", new SpecialBoxProperty() {
+                public void put(Box b, Object value) { }
+                public Object get(Box b) { return new Apply(b); }
+            });
     }
 
         
@@ -692,6 +697,42 @@ class SpecialBoxProperty {
         catch (NumberFormatException e) { return 0; }
     }
         
+    /** helper that converts a String to a short according to JavaScript coercion rules */
+    private static class Apply extends JSObject.JSFunction {
+
+        Box b;
+        public Apply(Box b) { this.b = b; }
+
+        public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+
+            // apply a template
+            if (args[0] instanceof String) {
+                String templatename = (String)args[0];
+                Template t = Template.getTemplate(templatename, null);
+                if (t == null) {
+                    if (Log.on) Log.log(this, "template " + templatename + " not found at " +
+                                        Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+                } else {
+                    if (!ThreadMessage.suspendThread()) try {
+                        Function callback = args.length < 2 ? null : (Function)args[1];
+                        t.apply(b, null, null, callback, 0, t.numUnits());
+                    } finally {
+                        ThreadMessage.resumeThread();
+                    }
+                }
+
+            // apply a list of properties
+            } else if (args[0] instanceof Scriptable && !(args[0] instanceof Box)) {
+                // FIXME: need to ensure that this is putGlobally(), but still run traps...
+                Scriptable s = (Scriptable)args[0];
+                Object[] keys = s.getIds();
+                for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), null, s.get(keys[j].toString(), s));
+            }
+
+            return b;
+        }
+    }
+
 }
 
         

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 00b7066..1d2326d 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -198,8 +198,8 @@ public final class XWT extends JSObject {
     private static final JSObject.JSFunction newBox = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
 
-                if (args.length > 0 && args[0] != null && !args[0].equals("box") && !(Thread.currentThread() instanceof ThreadMessage))
-                    if (Log.on) Log.log(XWT.class, "DEPRECATED: you should not call xwt.newBox() from the foreground thread at " +
+                if (args.length > 0)
+                    if (Log.on) Log.log(XWT.class, "DEPRECATED: xwt.newBox() with multiple arguments is deprecated; use xwt.newBox().apply() " +
                                         Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
 
                 Function callback = null;