2003/11/03 07:36:40

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

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index f51f4e6..53514ed 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -45,9 +45,9 @@ public final class XWT extends JS.Obj {
     }
 
     public Object put(Object name, final Object value) {
-        if (name.equals("thread") && value != null && (value instanceof JS.Callable || value instanceof JS.CompiledFunction)) {
+        if (name.equals("thread") && value != null && (value instanceof JS.Callable || value instanceof Function)) {
             Scheduler.add(new Scheduler.Task() { public void perform() {
-                new JS.Context((CompiledFunction)value, null, null).resume(null);
+                new JS.Context((Function)value, null).resume();
             } });
         } else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
         else if (name.equals("frame")) Platform.createSurface((Box)value, true, true);
@@ -84,9 +84,17 @@ public final class XWT extends JS.Obj {
             if (checkOnly) return Boolean.TRUE;
             return new Res.Zip((Res)args.elementAt(0));
 
+        } else if (method.equals("uncab")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new Res.Cab((Res)args.elementAt(0));
+
+        } else if (method.equals("cache")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new Res.CachedRes((Res)args.elementAt(0), "resources", true);
+
         } else if (method.equals("watchProgress")) {
             if (checkOnly) return Boolean.TRUE;
-            return new Res.ProgressWatcher((Res)args.elementAt(0), (JS.CompiledFunction)args.elementAt(1));
+            return new Res.ProgressWatcher((Res)args.elementAt(0), (Function)args.elementAt(1));
 
         } else if (method.equals("yield")) {
             if (checkOnly) return Boolean.TRUE;
@@ -191,14 +199,15 @@ public final class XWT extends JS.Obj {
         }
     }
 
+    // FIXME
     public static Object sleep(final int i) {
         final JS.Context jsthread = JS.Context.current();
         final long currentTime = System.currentTimeMillis();
-        final Scheduler.Task task = new Scheduler.Task() { public void perform() {
-            if (System.currentTimeMillis() - currentTime < i) Scheduler.add(this);
-            else jsthread.resume(null);
-        } };
-        Scheduler.add(task);
+        new Thread() { public void run() {
+            try { Thread.sleep(i); } catch (InterruptedException e) { }
+            Scheduler.add(new Scheduler.Task() { public void perform() {
+                jsthread.resume();
+            } }); } }.start();
         return JS.Context.pause;
     }
     
@@ -213,7 +222,7 @@ public final class XWT extends JS.Obj {
         }
         public Object get(Object key) {
             Object ret = super.get(key);
-            if(ret == null) ret = JS.Math.get(key);
+            if(ret == null) ret = org.xwt.js.Math.singleton.get(key);
             return ret;
         }
     }