2003/06/18 06:14:04

darcs-hash:20040130070146-2ba56-8d2164bcf37b2e9ea414f81d8ea43daea4d6e6d3.gz

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index c50ff7b..c3fec81 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -1504,4 +1504,31 @@ public final class Box extends JS.Scope {
 }
 
 
-
+/** this is in Box.java solely to work around a GCJ bug */
+class Apply extends JS.Callable {
+    Box b;
+    public Apply(Box b) { this.b = b; }
+    public Object call(JS.Array args) throws JS.Exn {
+        if (args.elementAt(0) instanceof String) {
+            String templatename = (String)args.elementAt(0);
+            Template t = Template.getTemplate(templatename, null);
+            if (t == null) {
+                if (Log.on) Log.logJS(this, "template " + templatename + " not found");
+            } else {
+                if (ThreadMessage.suspendThread()) try {
+                    JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
+                    t.apply(b, null, null, callback, 0, t.numUnits());
+                } finally {
+                    ThreadMessage.resumeThread();
+                }
+            }
+            
+        } else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
+            JS s = (JS)args.elementAt(0);
+            Object[] keys = s.keys();
+            for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), s.get(keys[j]));
+        }
+        
+        return b;
+    }
+}

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index cd86e3e..2da3410 100644 (file)
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -654,30 +654,8 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("apply", new SpecialBoxProperty() {
                 public void put(Box b, Object value) { }
-                public Object get(final Box b) { return new JS.Callable() {
-                        public Object call(JS.Array args) throws JS.Exn {
-                            if (args.elementAt(0) instanceof String) {
-                                String templatename = (String)args.elementAt(0);
-                                Template t = Template.getTemplate(templatename, null);
-                                if (t == null) {
-                                    if (Log.on) Log.logJS(this, "template " + templatename + " not found");
-                                } else {
-                                    if (ThreadMessage.suspendThread()) try {
-                                        JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
-                                        t.apply(b, null, null, callback, 0, t.numUnits());
-                                    } finally {
-                                        ThreadMessage.resumeThread();
-                                    }
-                                }
-                                
-                            } else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
-                                JS s = (JS)args.elementAt(0);
-                                Object[] keys = s.keys();
-                                for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), s.get(keys[j]));
-                            }
-                            
-                            return b;
-                        } }; } });
+                public Object get(final Box b) { return new Apply(b); }
+            });
         
         specialBoxProperties.put("id", new SpecialBoxProperty() {
                 public void put(Box b, Object value) { }