X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2FXWT.java;fp=src%2Forg%2Fxwt%2FXWT.java;h=d599f0eefc54f09c3cfc8c5bd1fdb19e509e537e;hb=1520bffb91aed116c109133503f21082951e7d09;hp=76db51a0fedf59b9c97829c2131b59dcbfde84b1;hpb=d4fc62b0a4738cdab3dd605d7ec34dab94341867;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 76db51a..d599f0e 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -13,8 +13,8 @@ import org.bouncycastle.util.encoders.Base64;
 /** Singleton class that provides all functionality in the xwt.* namespace */
 public final class XWT extends JS {
 
-    public final Res rr;
-    public XWT(Res rr) { this.rr = rr; }
+    public final Stream rr;
+    public XWT(Stream rr) { this.rr = rr; }
 
     private Cache subCache = new Cache(20);
     private Sub getSub(String s) {
@@ -132,7 +132,7 @@ public final class XWT extends JS {
                 if (a instanceof Box) throw new JSExn("can't graft onto Boxes");
                 if (a instanceof String) throw new JSExn("can't graft onto Strings");
                 if (a instanceof Number) throw new JSExn("can't graft onto Numbers");
-                if (a instanceof Res) return new Res.Graft((Res)a, b, c);
+                if (a instanceof Stream) return new Stream.Graft((Stream)a, b, c);
                 // FEATURE: grafting onto JS
                 throw new JSExn("cannot graft onto "+a.getClass());
             //#end
@@ -146,11 +146,11 @@ public final class XWT extends JS {
                 case 1:
                     //#switch(name)
                     case "ui.browser": Platform.newBrowserWindow((String)a); return null;
-                    case "clone": return new XWT((Res)a);
-                    case "stream.unzip": return new Res.Zip((Res)a);
-                    case "stream.uncab": return new Res.Cab((Res)a);
-                    case "stream.cache": try { return new Res.CachedRes((Res)a, "resources", true); }
-                                      catch (Res.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); }
+                    case "clone": return new XWT((Stream)a);
+                    case "stream.unzip": return new Stream.Zip((Stream)a);
+                    case "stream.uncab": return new Stream.Cab((Stream)a);
+                    case "stream.cache": try { return new Stream.CachedStream((Stream)a, "resources", true); }
+                                      catch (Stream.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); }
                     case "stream.url": return url2res((String)a);
                     case "thread.sleep": sleep(JS.toInt(a)); return null;
                     case "log.debug":   JS.log(this, a== null ? "**null**" : a.toString()); return null;
@@ -170,9 +170,9 @@ public final class XWT extends JS {
                     break;
                 case 2:
                     //#switch(name)
-                    case "stream.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b);
+                    case "stream.watch": return new Stream.ProgressWatcher((Stream)a, (JSFunction)b);
                     case "apply":
-                        if (b instanceof Res) Template.getTemplate((Res)b).apply((Box)a, XWT.this);
+                        if (b instanceof Stream) Template.getTemplate((Stream)b).apply((Box)a, XWT.this);
                         else {
                             JS to = (JS)a, from = (JS)b; Object k;
                             for (Enumeration e = from.keys(); e.hasMoreElements();) {
@@ -192,11 +192,11 @@ public final class XWT extends JS {
         throw new JSExn("invalid number of arguments for xwt object method "+name+"()");
     }
 
-    public Res url2res(String url) throws JSExn {
-        if (url.startsWith("http://")) return new Res.HTTP(url);
-        else if (url.startsWith("https://")) return new Res.HTTP(url);
-        else if (url.startsWith("data:")) return new Res.ByteArray(Base64.decode(url.substring(5)), null);
-        else if (url.startsWith("utf8:")) return new Res.ByteArray(url.substring(5).getBytes(), null);
+    public Stream url2res(String url) throws JSExn {
+        if (url.startsWith("http://")) return new Stream.HTTP(url);
+        else if (url.startsWith("https://")) return new Stream.HTTP(url);
+        else if (url.startsWith("data:")) return new Stream.ByteArray(Base64.decode(url.substring(5)), null);
+        else if (url.startsWith("utf8:")) return new Stream.ByteArray(url.substring(5).getBytes(), null);
         else throw new JSExn("invalid resource specifier " + url);
         // FIXME support file:// via dialog boxes
     }