updated org.ibex.xt for new JS

[org.ibex.xt.git] / src / org / ibex / xt / Prevalence.java

diff --git a/src/org/ibex/xt/Prevalence.java b/src/org/ibex/xt/Prevalence.java
index 5fb807c..98f8071 100644 (file)
--- a/src/org/ibex/xt/Prevalence.java
+++ b/src/org/ibex/xt/Prevalence.java
@@ -50,16 +50,18 @@ public class Prevalence {
                     String base = cx.getRealPath("/") + "WEB-INF" + File.separatorChar + "prevalent";
                     System.err.println("prevayling to " + base);
                     pf.configurePrevalenceBase(base);
-                    XStreamSnapshotManager manager = new XStreamSnapshotManager(new JS(), base, null) {
+                    /*
+                    XmlSnapshotManager manager = new XmlSnapshotManager(new JS(), base, null); {
                             protected XStream createXStream() {
                                 XStream xstream = new XStream();
                                 xstream.alias("js", JS.class);
                                 xstream.alias("jsdate", JSDate.class);
                                 return xstream;
                             }
-                        };
+                            };
                     System.err.println("configuring with " + manager);
                     pf.configureSnapshotManager(manager);
+                    */
                     //pf.configureSnapshotManager(new SnapshotManager(new JS(), base));
                     //pf.configureClassLoader(JSTransaction.class.getClassLoader());
                     prevayler = pf.create();
@@ -73,27 +75,24 @@ public class Prevalence {
     public static class JSTransaction implements Transaction {
         public static final long serialVersionUid = 0xfb2aa281;
         private JS js;
-        JSScope newscope;
-        Vec v;
+        Template.Scope newscope;
+        String[] 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.elementAt(i))) continue;
-                newscope.put(v.elementAt(i), JS.getParentScope(js).get(v.elementAt(i)));
+            newscope = new Template.Scope(null);
+            this.js = JSU.cloneWithNewGlobalScope(js, newscope);
+            v = this.js.getFormalArgs();
+            for(int i=0; i<v.length; i++) {
+                if (JSU.S("prevalent").equals(v[i])) continue;
+                newscope.put(JSU.S(v[i]), js.get(JSU.S(v[i])));
             }
         }
         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.elementAt(0));
-                Object b = v.size() <= 1 ? null : newscope.get(v.elementAt(1));
-                Object c = v.size() <= 2 ? null : newscope.get(v.elementAt(2));
-                Object[] rest = v.size() <= 3 ? null : new Object[v.size() - 3];
-                for(int i=3; i<v.size(); i++) rest[i-3] = v.elementAt(i);
-                js.call(a, b, c, rest, v.size());
+                newscope.put(JSU.S("prevalent"), (JS)o);
+                newscope.put(JSU.S("now"), new JSDate(now.getTime()));
+                JS[] args = new JS[v.length];
+                for(int i=0; i<v.length; i++) args[i] = JSU.S(v[i]);
+                js.call(null, args);
             } catch (Exception e) { throw new RuntimeException(e); }
         }
     }
@@ -102,10 +101,10 @@ 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 = JSU.cloneWithNewGlobalScope(js, null); this.a = a; }
         public Object query(Object o, Date now) {
             try {
-                return js.call(o, a, new JSDate(now.getTime()), null, 3);
+                return js.call(null, new JS[] { (JS)o, (JS)a, new JSDate(now.getTime()) });
             } catch (Exception e) { throw new RuntimeException(e); }
         }
     }