2003/11/18 10:47:26

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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index a4cc602..426266c 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -30,31 +30,45 @@ public abstract class Picture {
     public abstract int getWidth();
 
     /** Pictures, cache keyed by Res instance */
-    private static Cache cache = new Cache();
+    private static Cache cache = new Cache(100);
     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;
-        }
+    public static class Holder {
+        public Picture picture = null;
+    }
 
-        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");
+    /** turns a resource into a Picture.Source and passes it to the callback */
+    public static Holder fromRes(final Res r, final Scheduler.Task callback) {
+        Holder ret = (Holder)cache.get(r);
+        if (ret == null) {
+            ret = new Holder();
             cache.put(r, ret);
-            ret.res = r;
-            callback.call(ret);
-        } catch (Exception e) {
-            Log.log(Picture.class, e);
+            if (callback == null) return null;
         }
+        final Holder holder = ret;
+        if (callback != null)
+            new java.lang.Thread() { public void run() {
+                try {
+                    final byte[] b = InputStreamToByteArray.convert(r.getInputStream());
+                    Scheduler.add(new Scheduler.Task() { public void perform() {
+                        try {
+                            Picture p = null;
+                            InputStream pbis = new ByteArrayInputStream(b);
+                            if ((b[0] & 0xff) == 'G') p = gif.fromInputStream(pbis, "some picture");
+                            else if ((b[0] & 0xff) == 137) p = new PNG().fromInputStream(pbis, "some picture");
+                            else if ((b[0] & 0xff) == 0xff) p = Platform.decodeJPEG(pbis, "some picture");
+                            else throw new JSExn("couldn't figure out image type from first byte");
+                            p.res = r;
+                            holder.picture = p;
+                            Scheduler.add(callback);
+                        } catch (Exception e) {
+                            Log.log(Picture.class, e);
+                        } } });
+                } catch (IOException e) {
+                    Log.log(Picture.class, e);
+                    return;
+                }
+            } }.start();
+        return ret;
     }
 }