2003/06/18 07:54:30

darcs-hash:20040130070204-2ba56-1200fa3f99cda91ea97ed3d438aad1eacaadfede.gz

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index c3fec81..501f061 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -1504,31 +1504,3 @@ 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 2da3410..56ee209 100644 (file)
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -683,6 +683,33 @@ class SpecialBoxProperty {
         catch (NumberFormatException e) { return 0; }
     }
         
+    private static 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;
+        }
+    }
 }