2003/11/16 08:28:10

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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 3168390..13440f9 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -33,25 +33,34 @@ public abstract class Picture {
     private static Cache cache = new Cache(100);
     private static GIF gif = new GIF();
     
+    public static class Holder {
+        public Picture picture = null;
+    }
+
     /** turns a resource into a Picture.Source and passes it to the callback */
-    public static Picture fromRes(final Res r, final Callback callback) {
-        Picture ret = (Picture)cache.get(r);
-        if (ret != null) return ret;
+    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);
+            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 ret = null;
+                            Picture p = null;
                             InputStream pbis = new ByteArrayInputStream(b);
-                            if ((b[0] & 0xff) == 'G') ret = gif.fromInputStream(pbis, "some picture");
-                            else if ((b[0] & 0xff) == 137) ret = new PNG().fromInputStream(pbis, "some picture");
-                            else if ((b[0] & 0xff) == 0xff) ret = Platform.decodeJPEG(pbis, "some picture");
+                            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 JS.Exn("couldn't figure out image type from first byte");
-                            ret.res = r;
-                            cache.put(r, ret);
-                            callback.call(ret);
+                            p.res = r;
+                            holder.picture = p;
+                            Scheduler.add(callback);
                         } catch (Exception e) {
                             Log.log(Picture.class, e);
                         } } });
@@ -60,6 +69,6 @@ public abstract class Picture {
                     return;
                 }
             } }.start();
-        return null;
+        return ret;
     }
 }