X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSOAP.java;h=2771304bc23bd81eb7815dddd566675e9a03cd59;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=1a279f4aa1721f900cbb7c88e62b25490848bce0;hpb=ac822316ceb6f9a709901870bd1e2dc2974285e5;p=org.ibex.core.git

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index 1a279f4..2771304 100644
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -1,10 +1,10 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import org.mozilla.javascript.*;
+import org.xwt.js.*;
 import org.xwt.util.*;
 import org.bouncycastle.util.encoders.Base64;
 
@@ -28,7 +28,7 @@ class SOAP extends XMLRPC {
     String nameSpace = null;
 
     /** When you get a property from an SOAP, it just returns another SOAP with the property name tacked onto methodname. */
-    public Object get(String name, Scriptable start) {
+    public Object get(String name) {
         return new SOAP(url.toString(), (methodname.equals("") ? "" : methodname + ".") + name, http, action, nameSpace);
     }
 
@@ -41,9 +41,9 @@ class SOAP extends XMLRPC {
         if (name.equals("SOAP-ENV:Envelope")) return;
         if (name.equals("SOAP-ENV:Body")) return;
         if (name.equals("SOAP-ENV:Fault")) fault = true;
-
+ 
         // add a generic struct; we'll change this if our type is different
-        objects.addElement(new JSObject(false));
+        objects.addElement(new JS.Obj());
 
         for(int i=0; i<keys.length; i++) {
             String key = keys[i];
@@ -67,9 +67,9 @@ class SOAP extends XMLRPC {
                 } else if (value.endsWith("null")) {
                     objects.removeElementAt(objects.size() - 1);
                     objects.addElement(null);
-                } else if (value.endsWith("arrayType") || value.endsWith("Array") || key.endsWith("arrayType")) {
+                } else if (value.endsWith("arrayType") || value.endsWith("JS.Array") || key.endsWith("arrayType")) {
                     objects.removeElementAt(objects.size() - 1);
-                    objects.addElement(Context.enter().newArray(org.xwt.util.JSObject.defaultObjects, new Object[] { } ));
+                    objects.addElement(new JS.Array());
                 }
             }
         }
@@ -92,9 +92,9 @@ class SOAP extends XMLRPC {
 
             } else if (me instanceof byte[]) {
                 objects.removeElementAt(objects.size() - 1);
-                objects.addElement(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))));
+                objects.addElement(new Res.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size()))));
                 content.reset();                
-                
+
             } else if (me instanceof Integer) {
                 objects.removeElementAt(objects.size() - 1);
                 objects.addElement(new Integer(new String(content.getBuf(), 0, content.size())));
@@ -147,20 +147,20 @@ class SOAP extends XMLRPC {
         if (objects.size() < 2) return;
 
         // our parent "should" be an aggregate type -- add ourselves to it.
-        if (parent != null && parent instanceof NativeArray) {
+        if (parent != null && parent instanceof JS.Array) {
             objects.removeElementAt(objects.size() - 1);
-            ((NativeArray)parent).put((int)((NativeArray)parent).jsGet_length(), (NativeArray)parent, me);
+            ((JS.Array)parent).addElement(me);
 
-        } else if (parent != null && parent instanceof Scriptable) {
+        } else if (parent != null && parent instanceof JS) {
             objects.removeElementAt(objects.size() - 1);
-            ((Scriptable)parent).put(name, (Scriptable)parent, me);
+            ((JS)parent).put(name, me);
 
         }
 
     }
 
     /** Appends the SOAP representation of <code>o</code> to <code>sb</code> */
-    void appendObject(String name, Object o, StringBuffer sb) throws JavaScriptException {
+    void appendObject(String name, Object o, StringBuffer sb) throws JS.Exn {
         if (o instanceof Number) {
             if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
                 sb.append("                <" + name + " xsi:type=\"xsd:int\">");
@@ -177,10 +177,10 @@ class SOAP extends XMLRPC {
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof ByteStream) {
+        } else if (o instanceof Res) {
             try {
                 sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
-                InputStream is = ((ByteStream)o).getInputStream();
+                InputStream is = ((Res)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
                     int numread = is.read(buf, 0, 54);
@@ -199,7 +199,7 @@ class SOAP extends XMLRPC {
             } catch (IOException e) {
                 if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via SOAP");
                 if (Log.on) Log.log(this, e);
-                throw new JavaScriptException("caught IOException while attempting to send a ByteStream via SOAP");
+                throw new JS.Exn("caught IOException while attempting to send a ByteStream via SOAP");
             }
 
         } else if (o instanceof String) {
@@ -221,24 +221,22 @@ class SOAP extends XMLRPC {
             }
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof NativeArray) {
-            NativeArray na = (NativeArray)o;
-            sb.append("                <" + name + " SOAP-ENC:arrayType=\"xsd:ur-type[" + na.jsGet_length() + "]\">");
-            for(int i=0; i<na.jsGet_length(); i++)
-                appendObject("item", na.get(i, na), sb);
+        } else if (o instanceof JS.Array) {
+            JS.Array a = (JS.Array)o;
+            sb.append("                <" + name + " SOAP-ENC:arrayType=\"xsd:ur-type[" + a.length() + "]\">");
+            for(int i=0; i<a.length(); i++) appendObject("item", a.elementAt(i), sb);
             sb.append("</" + name + ">\r\n");
 
-        } else if (o instanceof Scriptable && !(o instanceof Undefined)) {
-            Scriptable s = (Scriptable)o;
+        } else if (o instanceof JS) {
+            JS j = (JS)o;
             sb.append("                <" + name + ">");
-            Object[] ids = s.getIds();
-            for(int i=0; i<ids.length; i++)
-                appendObject(ids[i].toString(), s.get(ids[i].toString(), s), sb);
+            Object[] ids = j.keys();
+            for(int i=0; i<ids.length; i++) appendObject(ids[i].toString(), j.get(ids[i].toString()), sb);
             sb.append("</" + name + ">\r\n");
         }
     }
 
-    protected String send(Object[] args, HTTP http) throws JavaScriptException, IOException {
+    protected String send(JS.Array args, HTTP http) throws JS.Exn, IOException {
         // build up the request
         StringBuffer content = new StringBuffer();
         content.append("SOAPAction: " + action + "\r\n\r\n");
@@ -253,10 +251,10 @@ class SOAP extends XMLRPC {
         content.append(methodname);
         content.append(nameSpace != null ? " xmlns=\"" + nameSpace + "\"" : "");
         content.append(">\r\n");
-        if (args.length > 0) {
-            Object[] o = ((Scriptable)args[0]).getIds();
+        if (args.length() > 0) {
+            Object[] o = ((JS)args.elementAt(0)).keys();
             for(int i=0; i<o.length; i++)
-                appendObject(o[i].toString(), ((Scriptable)args[0]).get(o[i].toString(), (Scriptable)args[0]), content);
+                appendObject(o[i].toString(), ((JS)args.elementAt(0)).get(o[i].toString()), content);
         }
         content.append("    </" + methodname + "></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n");
         return content.toString();