2003/10/01 03:08:31

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

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 22d20a9..f5e11c4 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -13,9 +13,9 @@ import org.bouncycastle.util.encoders.Base64;
 /** Singleton class that provides all functionality in the xwt.* namespace */
 public final class XWT extends JS.Obj {
 
-    public Res resourceRoot = null;
+    public final Res rr;
+    public XWT(Res rr) { this.rr = rr; }
 
-    public static final XWT singleton = new XWT();
     private final JS xwtMath = new XWTMath();
     private final JS xwtString = new XWTString();
 
@@ -24,6 +24,8 @@ public final class XWT extends JS.Obj {
 
     public Object get(Object name) {
         if (name.equals("alt")) return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
+        else if (name.equals("rr")) return rr;
+        else if (name.equals("box")) return new Box();
         else if (name.equals("control")) return Surface.control ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("shift")) return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("clipboard")) return Platform.getClipBoard();
@@ -52,7 +54,6 @@ public final class XWT extends JS.Obj {
         if (name.equals("thread") && value != null && value instanceof JS.Callable) ThreadMessage.newthread((JS.Callable)value);
         else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
         else if (name.equals("proxyAuthorization")) {
-            // FIXME: undocumented, possibly insecure
             HTTP.Proxy.Authorization.authorization = value.toString();
             HTTP.Proxy.Authorization.waitingForUser.release();
         } else super.put(name, value);
@@ -66,6 +67,14 @@ public final class XWT extends JS.Obj {
             Platform.newBrowserWindow(args.elementAt(0).toString());
             return null;
 
+        } else if (method.equals("clone")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new XWT((Res)args.elementAt(0));
+
+        } else if (method.equals("watchProgress")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new Res.ProgressWatcher((Res)args.elementAt(0), (JS.Callable)args.elementAt(1));
+
         } else if (method.equals("yield")) {
             if (checkOnly) return Boolean.TRUE;
             sleep(0);
@@ -104,10 +113,6 @@ public final class XWT extends JS.Obj {
                 return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), args.elementAt(2).toString());
             else return null;
 
-        } else if (method.equals("newBox")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Box();
-
         } else if (method.equals("sleep")) {
             if (checkOnly) return Boolean.TRUE;
             if (args != null && (args.length() != 1 || args.elementAt(0) == null)) return null;
@@ -119,7 +124,7 @@ public final class XWT extends JS.Obj {
             if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1) return null;
             String file = Platform.fileDialog(args.elementAt(0).toString(), false);
-            return file == null ? null : new Res.stringToResource("file:" + file);
+            return file == null ? null : Res.stringToRes("file:" + file);
 
         } else if (method.equals("saveFile")) {
             if (checkOnly) return Boolean.TRUE;