X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fibex%2Fxt%2FPrevalence.java;h=80d1f85024a94371c387c47383427a2ab4bdab74;hb=f452b10d473d1a3f6b9dc45a98fb6cc98d7f3944;hp=e638cfa18135e60b841d0ee3f05235b54b9eb534;hpb=50cd2b0cdda6355214e16e8e9f8dd65a31fe6934;p=org.ibex.xt-crawshaw.git

diff --git a/src/java/org/ibex/xt/Prevalence.java b/src/java/org/ibex/xt/Prevalence.java
index e638cfa..80d1f85 100644
--- a/src/java/org/ibex/xt/Prevalence.java
+++ b/src/java/org/ibex/xt/Prevalence.java
@@ -1,13 +1,11 @@
-package ibex.xt;
+package org.ibex.xt;
 
 import java.io.*;
-
-import java.net.*;
-import javax.servlet.ServletContext; // FIXME: remove references
-
 import java.util.*;
-import ibex.util.*;
-import ibex.js.*;
+import javax.servlet.ServletContext;
+
+import org.ibex.util.*;
+import org.ibex.js.*;
 
 import org.prevayler.*;
 import org.prevayler.implementation.snapshot.*;
@@ -73,27 +71,13 @@ public class Prevalence {
     public static class JSTransaction implements Transaction {
         public static final long serialVersionUid = 0xfb2aa281;
         private JS js;
-        JSScope newscope;
-        List v;
-        public JSTransaction(JS js) throws JSExn {
-            newscope = new JSScope(null);
-            this.js = JS.cloneWithNewParentScope(js, newscope);
-            v = JS.getFormalArgs(this.js);
-            for(int i=0; i<v.size(); i++) {
-                if ("prevalent".equals(v.get(i))) continue;
-                newscope.put(v.get(i), JS.getParentScope(js).get(v.get(i)));
-            }
-        }
+        public JSTransaction(JS js) throws JSExn { this.js = js; }
         public void executeOn(Object o, Date now) {
             try {
-                newscope.put("prevalent", o);
-                newscope.put("now", new JSDate(now.getTime()));
-                Object a = v.size() <= 0 ? null : newscope.get(v.get(0));
-                Object b = v.size() <= 1 ? null : newscope.get(v.get(1));
-                Object c = v.size() <= 2 ? null : newscope.get(v.get(2));
-                Object[] rest = v.size() <= 3 ? null : new Object[v.size() - 3];
-                for(int i=3; i<v.size(); i++) rest[i-3] = v.get(i);
-                js.call(a, b, c, rest, v.size());
+                JSScope scope = JS.getParentScope(js);
+                scope.put("prevalent", o);
+                scope.put("now", new JSDate(now.getTime()));
+                js.call(null, null, null, null, 0);
             } catch (Exception e) { throw new RuntimeException(e); }
         }
     }
@@ -102,7 +86,7 @@ public class Prevalence {
         public static final long serialVersionUid = 0xfb2aa282;
         private JS js;
         private Object a;
-        public JSQuery(JS js, Object a) { this.js = JS.cloneWithNewParentScope(js, null); this.a = a; }
+        public JSQuery(JS js, Object a) { this.js = js; this.a = a; }
         public Object query(Object o, Date now) {
             try {
                 return js.call(o, a, new JSDate(now.getTime()), null, 3);