2003/12/29 22:29:30

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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 4d563e0..82df487 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -17,17 +17,17 @@ import org.xwt.translators.*;
 public class Picture {
 
     public Picture() { this.res = null; }
-    public Picture(Res r) { this.res = r; }
-    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Res that loaded them
+    public Picture(Stream r) { this.res = r; }
+    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Stream that loaded them
 
-    public Res res = null;                         ///< the resource we were loaded from
+    public Stream res = null;                         ///< the resource we were loaded from
     public int width = -1;                         ///< the width of the image
     public int height = -1;                        ///< the height of the image
     public int[] data = null;                      ///< argb samples
     public boolean isLoaded = false;               ///< true iff the image is fully loaded
     
     /** turns a resource into a Picture.Source and passes it to the callback */
-    public static Picture load(final Res r, final Scheduler.Task callback) {
+    public static Picture load(final Stream r, final Scheduler.Task callback) {
         Picture ret = (Picture)cache.get(r);
         if (ret == null) cache.put(r, ret = Platform.createPicture(r));
         final Picture p = ret;
@@ -39,10 +39,10 @@ public class Picture {
                     in = r.getInputStream();
                 } catch (IOException e) {
                     in = null;
-                    if (r instanceof Res.Ref) {
+                    if (r instanceof Stream.Ref) {
                         // add extensions to the resource, looking for the image
-                        Res.Ref ref = (Res.Ref)r;
-                        Res newr;
+                        Stream.Ref ref = (Stream.Ref)r;
+                        Stream newr;
 
                         String[] exts = new String[] { ".png", ".jpeg", ".gif" };
                         for (int i=0; i < exts.length && in == null; i++) {