2003/10/31 09:50:08

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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 29e3184..a4cc602 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -20,33 +20,8 @@ import org.xwt.translators.*;
  */
 public abstract class Picture {
 
-    /** Pictures, cached by Res */
-    private static Cache cache = new Cache();
-
-    private static GIF gif = new GIF();
-    private static PNG png = new PNG();
-    
-    /** turns a resource into a Picture.Source */
-    public static Picture fromRes(Res r) {
-        // FIXME: put self in background thread if needed
-        Picture ret = (Picture)cache.get(r);
-        if (ret == null) {
-            try {
-                PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
-                int c = pbis.read();
-                pbis.unread(c);
-                if (c == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
-                else if (c == 137) ret = png.fromInputStream(pbis, r.getDescriptiveName());
-                else if (c == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
-                else throw new JS.Exn("couldn't figure out image type from first byte");
-                cache.put(r, ret);
-            } catch (IOException e) {
-                Log.logJS(Picture.class, e);
-                return null;
-            }
-        }
-        return ret;
-    }
+    /** the resource that created this Picture */
+    public Res res = null;
 
     /** the height of the picture */
     public abstract int getHeight();
@@ -54,4 +29,32 @@ public abstract class Picture {
     /** the width of the picture */
     public abstract int getWidth();
 
+    /** Pictures, cache keyed by Res instance */
+    private static Cache cache = new Cache();
+    private static GIF gif = new GIF();
+    
+    /** turns a resource into a Picture.Source and passes it to the callback */
+    public static void fromRes(final Res r, final Callback callback) {
+        Picture ret = (Picture)cache.get(r);
+        if (ret != null) {
+            callback.call(ret);
+            return;
+        }
+
+        try {
+            // FIXME: put self in background
+            PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
+            int c = pbis.read();
+            pbis.unread(c);
+            if (c == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
+            else if (c == 137) ret = new PNG().fromInputStream(pbis, r.getDescriptiveName());
+            else if (c == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
+            else throw new JS.Exn("couldn't figure out image type from first byte");
+            cache.put(r, ret);
+            ret.res = r;
+            callback.call(ret);
+        } catch (Exception e) {
+            Log.log(Picture.class, e);
+        }
+    }
 }