X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=0652e09cef976852db4763f430b6e66cb915c040;hb=8c1756ef3fd42cc2f324baf47e13a83f51045efe;hp=53da6ffd090f82f19354de1883d1abb7f6d83e75;hpb=c89a34fe990cf3d82a919eaff32288d25ce3ecb4;p=org.ibex.core.git

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index 53da6ff..0652e09 100644
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -12,19 +12,6 @@ import org.bouncycastle.util.encoders.Base64;
 /** Base class for XWT resources */
 public abstract class Res extends JS {
 
-
-    // Public Static //////////////////////////////////////////////////////////////////////
-
-    // FIXME: move to XWT.load()?
-    public static Res fromString(String url) {
-        if (url.startsWith("http://")) return new HTTP(url);
-        else if (url.startsWith("https://")) return new HTTP(url);
-        else if (url.startsWith("data:")) return new ByteArray(Base64.decode(url.substring(5)), null);
-        else if (url.startsWith("utf8:")) return new ByteArray(url.substring(5).getBytes(), null);
-        throw new JS.Exn("invalid resource specifier " + url);
-    }
-
-
     // Base Class //////////////////////////////////////////////////////////////////////
 
     public String typeName() { return "resource"; }
@@ -198,10 +185,8 @@ public abstract class Res extends JS {
                         int ret = super.read(b, off, len);
                         if (ret != 1) bytesDownloaded += ret;
                         Scheduler.add(new Scheduler.Task() { public void perform() {
-                            JSArray args = new JSArray();
-                            args.addElement(new Integer(bytesDownloaded));
-                            args.addElement(new Integer(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0));
-                            callback.call(args);
+                            callback.call(N(bytesDownloaded),
+                                          N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2);
                         } });
                         return ret;
                     }