fix bug that prevented scar image from loading

darcs-hash:20050116070809-5007d-5cb490660cb486e61a7b6e458b255ba92c01ffb4.gz

diff --git a/src/org/ibex/js/JS.java b/src/org/ibex/js/JS.java
index 1617511..7c6d76c 100644 (file)
--- a/src/org/ibex/js/JS.java
+++ b/src/org/ibex/js/JS.java
@@ -151,7 +151,7 @@ public interface JS {
         }
         public JS getAndTriggerTraps(JS key) throws JSExn {
             Trap t = (Trap)super.get(key, 1);
-            return t == null ? (JS)super.get(key) : (JS)new Interpreter(t, null, false).run(null);
+            return t == null ? (JS)get(key) : (JS)new Interpreter(t, null, false).run(null);
         }
         public JS justTriggerTraps(JS key, JS val) throws JSExn {
             Trap t = (Trap)super.get(key, 1);

diff --git a/src/org/ibex/js/JSU.java b/src/org/ibex/js/JSU.java
index 805224b..db96ed3 100644 (file)
--- a/src/org/ibex/js/JSU.java
+++ b/src/org/ibex/js/JSU.java
@@ -10,7 +10,7 @@ public class JSU {
     public static final JS[] emptyArgs = new JS[] { };
 
     public static InputStream getInputStream(JS j) throws IOException {
-        while(j != null && j instanceof JS.Cloneable) j = j.unclone();
+        while(j != null && j instanceof JS.Clone) j = j.unclone();
         if (j != null && j instanceof Fountain) return ((Fountain)j).getInputStream();
         return null;
     }