2003/10/03 03:59:31

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

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index 3e6302b..df51b53 100644 (file)
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -20,11 +20,13 @@ public class Trap {
 
     static {
         String[] p = new String[] {
-            "sizetoimage", "shrink", "hshrink", "vshrink", "x", "y", "width", "height",
-            "flex", "hflex", "vflex", /*"cols", "rows",*/ "align", "invisible", "absolute", "globalx", "globaly",
-            "minwidth", "minheight", "height", "width", "maxwidth", "maxheight", 
-            "numchildren", "hpad", "vpad", "doublebuffered", "cursor",
-            "mousex", "mousey", "xwt", "static", "mouseinside", "root", "thisbox", "indexof", "svg"
+            "shrink", "hshrink", "vshrink", "x", "y",
+            "width", "height", "flex", "colspan", "rowspan", "cols",
+            "rows", "align", "invisible", "absolute", "globalx",
+            "globaly", "minwidth", "minheight", "height", "width",
+            "maxwidth", "maxheight", "numchildren", "hpad", "vpad",
+            "buffered", "cursor", "mousex", "mousey",
+            "mouseinside", "thisbox", "indexof", "path", "font", "fontsize"
         };
         for(int i=0; i<p.length; i++) PROHIBITED.put(p[i], Boolean.TRUE);
     };
@@ -54,16 +56,15 @@ public class Trap {
      *  @param f the function to place as a trap
      */
     static void addTrap(Box trapee, Object name, JS.CompiledFunction f) {
-        if (trapee.traps == null) trapee.traps = new Hash(10, 3);
 
         // check if this script has already placed a trap on this property
-        for(Trap t = (Trap)trapee.traps.get(name); t != null; t = t.next)
+        for(Trap t = (Trap)trapee.get(name, Trap.class); t != null; t = t.next)
             if (t.f == f) return;
         
         // actually place the trap
         Trap t = new Trap();
-        t.next = (Trap)trapee.traps.get(name);
-        trapee.traps.put(name, t);
+        t.next = (Trap)trapee.get(name, Trap.class);
+        trapee.put(name, Trap.class, t);
         t.trapee = trapee;
         t.name = name;
         t.f = f;
@@ -77,18 +78,16 @@ public class Trap {
      *  @param f the function to remove
      */
     static void delTrap(Box trapee, Object name, JS.CompiledFunction f) {
-        if (trapee.traps != null) {
-            Trap t = (Trap)trapee.traps.get(name);
-            if (t.f == f) {
-                trapee.traps.put(name, t.next);
+        Trap t = (Trap)trapee.get(name, Trap.class);
+        if (t.f == f) {
+            trapee.put(name, Trap.class, t.next);
+            return;
+        }
+        for(; t.next != null; t = t.next)
+            if (t.next.f == f) {
+                t.next = t.next.next;
                 return;
             }
-            for(; t.next != null; t = t.next)
-                if (t.next.f == f) {
-                    t.next = t.next.next;
-                    return;
-                }
-        }
         Log.logJS("warning: tried to remove a trap that had not been placed");
     }
 
@@ -97,17 +96,25 @@ public class Trap {
 
     private Trap() { }
 
-    /** the empty object, used for get-traps */
-    public static JS.Array emptyargs = new JS.Array();
-
     public Object perform() throws JS.Exn {
-        if (f.getNumFormalArgs() > 0) return cascade();
-        return f.call(new TrapArgs(this));
+        try {
+            if (f.getNumFormalArgs() > 0) return cascade();
+            return f.call(new TrapArgs(this));
+        } catch (Exception e) {
+            Log.log(this, "Exception thrown from within trap: " + e);
+            return null;
+        }
     }
     
     public void perform(Object val) throws JS.Exn {
-        if (f.getNumFormalArgs()== 0) cascade(val);
-        f.call(new TrapArgs(this, val));
+        try {
+            if (f.getNumFormalArgs() == 0) cascade(val);
+            TrapArgs ta = new TrapArgs(this, val);
+            Object ret = f.call(ta);
+            if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
+        } catch (Exception e) {
+            Log.log(this, "Exception thrown from within trap: " + e);
+        }
     }
     
     public Object cascade() {
@@ -122,11 +129,12 @@ public class Trap {
 
     private static class TrapArgs extends JS.Array {
         private Trap t;
+        public boolean cascadeHappened = false;
         public TrapArgs(Trap t) { this.t = t; }
         public TrapArgs(Trap t, Object value) { this.t = t; addElement(value); }
         
         public void put(Object key, Object val) {
-            if (key.equals("cascade")) t.cascade(val);
+            if (key.equals("cascade")) { cascadeHappened = true; t.cascade(val); }
             else super.put(key, val);
         }
 
@@ -136,6 +144,7 @@ public class Trap {
             if (key.equals("trapee")) return t.trapee;
             if (key.equals("trapname")) return t.name;
             if (key.equals("cascade")) return t.cascade();
+            if (key.equals("callee")) return t.f;
             return super.get(key);
         }
     }