Stream->Fountain, move Scheduler to Platform, HashMap->Hash

[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 c8b5895..ce7b20b 100644 (file)
--- a/src/org/ibex/graphics/Picture.java
+++ b/src/org/ibex/graphics/Picture.java
@@ -7,7 +7,6 @@ import java.io.*;
 import org.ibex.js.*;
 import org.ibex.plat.*;
 import org.ibex.util.*;
-import org.ibex.core.*;
 
 /** 
  *    The in-memory representation of a PNG or GIF image. It is
@@ -44,14 +43,12 @@ public class Picture {
         }
         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 ? JSU.getInputStream(stream) : b.getImage();
-                //} catch (IOException e) { Log.error(Picture.class, e);
-                } catch (JSExn e) { Log.error(Picture.class, e);
+                    in = JSU.getInputStream(stream);
+                } catch (IOException e) { Log.error(Picture.class, e);
+                //} catch (JSExn e) { Log.error(Picture.class, e);
                 }
                 if (in == null) { Log.warn(Picture.class, "couldn't load image for stream " + stream.unclone()); return; }
                 try {
@@ -64,7 +61,7 @@ public class Picture {
                     else if ((firstByte & 0xff) == 0xff) Platform.decodeJPEG(pbis, p);
                     else throw new JSExn("couldn't figure out image type from first byte");
                     p.loaded();
-                    Scheduler.add(callback);
+                    Platform.Scheduler.add(callback);
                 } catch (Exception e) {
                     Log.info(this, "exception while loading image");
                     Log.info(this, e);