2003/08/10 06:03:02

[org.ibex.core.git] / src / org / xwt / XWT.java

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index d7fccf4..33950f1 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -130,18 +130,14 @@ public final class XWT extends JS.Obj {
             if (args.elementAt(0) == null || (args.length() == 2 && args.elementAt(1) == null)) return null;
             String font = args.length() == 1 ? Platform.getDefaultFont() : args.elementAt(0).toString();
             String text = args.length() == 1 ? args.elementAt(0).toString() : args.elementAt(1).toString();
-            XWF xwf = XWF.getXWF(font);
-            if (xwf == null) return new Integer(Platform.stringWidth(font, text));
-            else return new Integer(xwf.stringWidth(text));
+            return new Integer(Platform.stringWidth(font, text));
         }});
 
         super.put("textheight", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() > 1) return null;
             if (args.length() == 1 && args.elementAt(0) == null) return null;
             String font = args.length() == 0 || args.elementAt(0) == null ? Platform.getDefaultFont() : args.elementAt(0).toString();
-            XWF xwf = XWF.getXWF(font);
-            if (xwf == null) return new Integer(Platform.getMaxAscent(font) + Platform.getMaxDescent(font));
-            else return new Integer(xwf.getMaxAscent() + xwf.getMaxDescent());
+            return new Integer(Platform.getMaxAscent(font) + Platform.getMaxDescent(font));
         }});
         
         super.put("newBox", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
@@ -150,8 +146,10 @@ public final class XWT extends JS.Obj {
             for(int i=1; i<args.length(); i++)
                 if (args.elementAt(i) instanceof JS.Callable && callback == null)
                     callback = (JS.Callable)args.elementAt(i);
-            Box ret = new Box(args.length() == 0 || args.elementAt(0) == null ? "box" : args.elementAt(0).toString(),
-                              Template.defaultImportList, callback);
+            Box ret = new Box();
+            if (!(args.length() == 0 || args.elementAt(0) == null))
+                Template.getTemplate(args.elementAt(0).toString(),
+                                     Template.defaultImportList).apply(ret, null, null, callback, 0, 1);
             for(int i=1; i<args.length(); i++)
                 if (args.elementAt(i) instanceof Box)
                     ret.put(ret.numChildren(), (Box)args.elementAt(i));
@@ -166,7 +164,7 @@ public final class XWT extends JS.Obj {
 
         super.put("sleep", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args != null && (args.length() != 1 || args.elementAt(0) == null)) return null;
-            int i = args == null ? 0 : SpecialBoxProperty.stoi(args.elementAt(0).toString());
+            int i = args == null ? 0 : Box.stoi(args.elementAt(0).toString());
             sleep(i);
             return null;
         }});
@@ -302,8 +300,8 @@ public final class XWT extends JS.Obj {
 
     super.put("prefetchImage", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
         if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
-        Box.getImage(args.elementAt(0).toString(),
-                     args.length() > 1 && args.elementAt(1) instanceof JS.Callable ? (JS.Callable)args.elementAt(1) : null);
+        ImageDecoder.getImageDecoder(args.elementAt(0).toString(),
+                                     args.length() > 1 && args.elementAt(1) instanceof JS.Callable ? (JS.Callable)args.elementAt(1) : null);
         return null;
     }});
     }
@@ -373,6 +371,8 @@ public final class XWT extends JS.Obj {
             put("decodeURIComponent",gs.get("decodeURIComponent"));
             put("encodeURI",gs.get("encodeURI"));
             put("encodeURIComponent",gs.get("encodeURIComponent"));
+            put("escape",gs.get("escape"));
+            put("unescape",gs.get("unescape"));
             put("fromCharCode",gs.get("stringFromCharCode"));
             setSeal(true);
         }