make core compile with new js stuff and Task replacement class

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

diff --git a/src/org/ibex/graphics/Picture.java b/src/org/ibex/graphics/Picture.java
index d1abf61..0a92677 100644 (file)
--- a/src/org/ibex/graphics/Picture.java
+++ b/src/org/ibex/graphics/Picture.java
@@ -1,9 +1,13 @@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.ibex;
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
+package org.ibex.graphics;
 import java.io.*;
 import org.ibex.js.*;
+import org.ibex.plat.*;
 import org.ibex.util.*;
-import org.ibex.translators.*;
+import org.ibex.core.*;
 
 /** 
  *    The in-memory representation of a PNG or GIF image. It is
@@ -18,7 +22,7 @@ public class Picture {
 
     public Picture() { this.stream = null; }
     public Picture(JS r) { this.stream = r; }
-    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Stream that loaded them
+    private static Cache cache = new Cache(100, true); ///< Picture, keyed by the Stream that loaded them
 
     public JS stream = null;                       ///< the stream we were loaded from
     public int width = -1;                         ///< the width of the image
@@ -30,16 +34,22 @@ public class Picture {
     protected void loaded() { isLoaded = true; }
 
     /** turns a stream into a Picture.Source and passes it to the callback */
-    public static Picture load(final JS stream, final Scheduler.Task callback) {
+    public static Picture load(final JS stream, final Callable callback) {
+        if(stream == null) throw new NullPointerException();
         Picture ret = (Picture)cache.get(stream);
-        if (ret == null) cache.put(stream, ret = Platform.createPicture(stream));
+        if (ret == null) {
+            ret = Platform.createPicture(stream);
+            if(ret == null) throw new NullPointerException();
+            cache.put(stream, ret);
+        }
         final Picture p = ret;
         if (!ret.isLoaded && callback != null) {
+            // FEATURE: This is kind of ugly - shouldn't need a blessing
             final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream);
             new java.lang.Thread() { public void run() {
                 InputStream in = null;
                 try {
-                    in = b == null ? Stream.getInputStream(stream) : b.getImage();
+                    in = b == null ? stream.getInputStream() : b.getImage();
                 } catch (IOException e) { Log.error(Picture.class, e);
                 } catch (JSExn e) { Log.error(Picture.class, e);
                 }