preliminary core conversion

[org.ibex.core.git] / src / org / ibex / net / SOAP.java

diff --git a/src/org/ibex/net/SOAP.java b/src/org/ibex/net/SOAP.java
index 55f18f5..3d998d5 100644 (file)
--- a/src/org/ibex/net/SOAP.java
+++ b/src/org/ibex/net/SOAP.java
@@ -136,7 +136,7 @@ public class SOAP extends XMLRPC {
         }
         
         // remove ourselves
-        Object me = objects.elementAt(objects.size() - 1);
+        JS me = (JS) objects.elementAt(objects.size() - 1);
 
         // find our parent
         Object parent = objects.size() > 1 ? objects.elementAt(objects.size() - 2) : null;
@@ -152,7 +152,7 @@ public class SOAP extends XMLRPC {
         } else if (parent != null && parent instanceof JS) {
             objects.removeElementAt(objects.size() - 1);
             try {
-                ((JS)parent).put(name, me);
+                ((JS)parent).put(JS.S(name), me);
             } catch (JSExn e) {
                 throw new Error("this should never happen");
             }
@@ -162,7 +162,9 @@ public class SOAP extends XMLRPC {
     }
 
     /** Appends the SOAP representation of <code>o</code> to <code>sb</code> */
-    void appendObject(String name, Object o, StringBuffer sb) throws JSExn {
+    void appendObject(String name, JS o, StringBuffer sb) throws JSExn {
+        // FIXME: Update for new api
+        /*
         if (o instanceof Number) {
             if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
                 sb.append("                <" + name + " xsi:type=\"xsd:int\">");
@@ -239,7 +241,7 @@ public class SOAP extends XMLRPC {
             }
             sb.append("</" + name + ">\r\n");
 
-        }
+        }*/
     }
 
     protected String buildRequest(JSArray args) throws JSExn, IOException {
@@ -261,7 +263,7 @@ public class SOAP extends XMLRPC {
             Enumeration e = ((JS)args.elementAt(0)).keys();
             while(e.hasMoreElements()) {
                 Object key = e.nextElement();
-                appendObject((String)key, ((JS)args.elementAt(0)).get(key), content);
+                appendObject((String)key, args.elementAt(0).get((JS)key), content);
             }
         }
         content.append("    </" + method + "></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n");