X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FXMLRPC.java;h=cc52aa61648c58598085302312bf9bfe1b09e0d1;hb=a6fb49b55117ea4cf330b412d2a2fff403fcd053;hp=44324e0171f18059da6502bdd650a8cf3e41d2d2;hpb=5a5f5ef235158d513c1f2879dc916b115a4fa9d0;p=org.ibex.js.git

diff --git a/src/org/ibex/js/XMLRPC.java b/src/org/ibex/js/XMLRPC.java
index 44324e0..cc52aa6 100644
--- a/src/org/ibex/js/XMLRPC.java
+++ b/src/org/ibex/js/XMLRPC.java
@@ -40,7 +40,7 @@ public class XMLRPC extends JS.Immutable {
     public XMLRPC(String url, String method, XMLRPC httpSource) {
         this.http = httpSource.http; this.url = url; this.method = method; }
     public JS get(JS name) throws JSExn {
-        return new XMLRPC(url, (method.equals("") ? "" : method + ".") + Script.toString(name), this); }
+        return new XMLRPC(url, (method.equals("") ? "" : method + ".") + JSU.toString(name), this); }
 
 
     /** this holds character content as we read it in -- since there is only one per instance, we don't support mixed content */
@@ -150,7 +150,7 @@ public class XMLRPC extends JS.Immutable {
                 for(i=objects.size() - 1; objects.get(i) != null; i--);
                 JSArray arr = new JSArray();
                 try {
-                    for(int j = i + 1; j<objects.size(); j++) arr.put(Script.N(j - i - 1), (JS)objects.get(j));
+                    for(int j = i + 1; j<objects.size(); j++) arr.put(JSU.N(j - i - 1), (JS)objects.get(j));
                 } catch (JSExn e) {
                     throw new Error("this should never happen");
                 }
@@ -279,7 +279,7 @@ public class XMLRPC extends JS.Immutable {
 
         } else if (o instanceof JSArray) {
             if (tracker.get(o) != null) throw new JSExn("attempted to send multi-ref data structure via XML-RPC");
-            tracker.put(o, Script.B(true));
+            tracker.put(o, JSU.B(true));
             sb.append("                <value><array><data>\n");
             JSArray a = (JSArray)o;
             for(int i=0; i < a.size(); i++) appendObject(a.get(i), sb);
@@ -287,7 +287,7 @@ public class XMLRPC extends JS.Immutable {
 
         } else if (o instanceof JS) {
             if (tracker.get(o) != null) throw new JSExn("attempted to send multi-ref data structure via XML-RPC");
-            tracker.put(o, Script.B(true));
+            tracker.put(o, JSU.B(true));
             JS j = (JS)o;
             sb.append("                <value><struct>\n");
             Enumeration e = j.keys();
@@ -330,7 +330,7 @@ public class XMLRPC extends JS.Immutable {
     final Object call(final Pausable callback, final JSArray args) {
         try {
             if (Log.rpc) Log.info(this, "call to " + url + " : " + method);
-            if (tracker == null) tracker = new Basket.HashMap();
+            if (tracker == null) tracker = new Basket.Hash();
             if (objects == null) objects = new Basket.Array();
             String request = buildRequest(args);
             if (Log.rpc) Log.info(this, "send:\n" + request);