ibex.core updates for new api

[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..572823c 100644 (file)
--- a/src/org/ibex/graphics/Picture.java
+++ b/src/org/ibex/graphics/Picture.java
@@ -1,9 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.ibex;
+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
@@ -30,11 +31,17 @@ 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 Task 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;