2004/01/14 01:44:21

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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 82df487..4a8289d 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 import java.io.*;
 import org.xwt.js.*;
@@ -17,40 +17,32 @@ import org.xwt.translators.*;
 public class Picture {
 
     public Picture() { this.res = null; }
-    public Picture(Stream r) { this.res = r; }
+    public Picture(JS r) { this.res = r; }
     private static Cache cache = new Cache(100);   ///< Picture, keyed by the Stream that loaded them
 
-    public Stream res = null;                         ///< the resource we were loaded from
+    public JS 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 Stream r, final Scheduler.Task callback) {
+    public static Picture load(JS rr, final Scheduler.Task callback) {
+        final JS r = rr;
         Picture ret = (Picture)cache.get(r);
         if (ret == null) cache.put(r, ret = Platform.createPicture(r));
         final Picture p = ret;
         if (!ret.isLoaded && callback != null)
             new java.lang.Thread() { public void run() {
                 // get the InputStream for the image
+                Log.info(Picture.class, "r is a " + r.getClass().getName());
                 InputStream in = null;
                 try {
-                    in = r.getInputStream();
+                    in = (r instanceof XWT.Blessing) ? ((XWT.Blessing)r).getImage() : Stream.getInputStream(r);
                 } catch (IOException e) {
-                    in = null;
-                    if (r instanceof Stream.Ref) {
-                        // add extensions to the resource, looking for the image
-                        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++) {
-                            newr = ref.addExtension(exts[i]);
-                            try { in = newr.getInputStream(); }
-                            catch (IOException f) { in = null; }
-                        }
-                    }
+                    Log.error(Picture.class, r);
+                } catch (JSExn e) {
+                    Log.error(Picture.class, r);
                 }
         
                 // could not find image