Revision: 2277
          http://vexi.svn.sourceforge.net/vexi/?rev=2277&view=rev
Author:   mkpg2
Date:     2007-09-20 08:31:07 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Cleanup. Formal args always != null. 

Modified Paths:
--------------
    trunk/core/org.vexi.core/src/org/vexi/core/Blessing.java
    trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp

Modified: trunk/core/org.vexi.core/src/org/vexi/core/Blessing.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Blessing.java    2007-09-20 
15:25:31 UTC (rev 2276)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Blessing.java    2007-09-20 
15:31:07 UTC (rev 2277)
@@ -70,7 +70,7 @@
        // behaviour would be to disable the cache for that value.
                // 
        // Adding a read trap -> Cache is dirty -> Remove item from cache.
-               if(f.getFormalArgs() != null && f.getFormalArgs().length == 0)
+               if(f.getFormalArgs().length == 0)
                cache.remove(key);
        super.addTrap(key, f);
     }

Modified: trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp  2007-09-20 15:25:31 UTC 
(rev 2276)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp  2007-09-20 15:31:07 UTC 
(rev 2277)
@@ -1380,8 +1380,11 @@
     }
 
     /** set flags on added traps */
-    public void addTrap(JS key, JS function) throws JSExn {
-        super.addTrap(key, function);
+    public void addTrap(JS key, JS f) throws JSExn {
+        super.addTrap(key, f);
+        // We are only interested in write traps
+        if (f.getFormalArgs().length !=1)
+               return;
         //#switch (JSU.toString(key))
         case "x":         set(X_TRAP);
         case "y":         set(Y_TRAP);
@@ -1398,8 +1401,6 @@
         case "Leave":     set(LEAVE_TRAP);
         case "_Move":     set(MOVE_TRAP);
         case "Move":      set(MOVE_TRAP);
-        case "ChildAdded": throw new JSExn("Attempt to set trap on deprecated 
property 'ChildAdded'");
-        case "ChildRemoved": throw new JSExn("Attempt to set trap on 
deprecated property 'ChildRemoved'");
         //#end
     }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to