2003/09/21 10:26:53

[org.ibex.core.git] / src / org / xwt / XMLRPC.java

diff --git a/src/org/xwt/XMLRPC.java b/src/org/xwt/XMLRPC.java
index 64d3fee..f11413c 100644 (file)
--- a/src/org/xwt/XMLRPC.java
+++ b/src/org/xwt/XMLRPC.java
@@ -1,4 +1,4 @@
-// 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.*;
@@ -103,9 +103,12 @@ class XMLRPC extends JS.Callable {
             else if (c.localName.equals("double"))
                 objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1);
             
+            // FIXME
+            /*
             else if (c.localName.equals("base64"))
                 objects.setElementAt(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1);
-            
+            */
+
             else if (c.localName.equals("name"))
                 objects.addElement(new String(content.getBuf(), 0, content.size()));
             
@@ -123,7 +126,7 @@ class XMLRPC extends JS.Callable {
                   if (i > 0) s = s.substring(i);
                   
                   try {
-                  NativeDate nd = (NativeDate)Context.enter().newObject(org.xwt.util.JS.Obj.defaultObjects, "Date");
+                  NativeDate nd = (NativeDate)JS.Thread.enter().newObject(org.xwt.util.JS.Obj.defaultObjects, "Date");
                   double date = NativeDate.date_msecFromDate(Double.valueOf(s.substring(0, 4)).doubleValue(),
                   Double.valueOf(s.substring(4, 6)).doubleValue() - 1,
                   Double.valueOf(s.substring(6, 8)).doubleValue(),
@@ -196,6 +199,8 @@ class XMLRPC extends JS.Callable {
             sb.append(((Boolean)o).booleanValue() ? "1" : "0");
             sb.append("</boolean></value>\n");
 
+            //FIXME
+            /*
         } else if (o instanceof ByteStream) {
             try {
                 sb.append("                <value><base64>\n");
@@ -219,6 +224,7 @@ class XMLRPC extends JS.Callable {
                 if (Log.on) Log.log(this, e);
                 throw new JS.Exn("caught IOException while attempting to send a ByteStream via XML-RPC");
             }
+            */
 
         } else if (o instanceof String) {
             sb.append("                <value><string>");
@@ -386,8 +392,8 @@ class XMLRPC extends JS.Callable {
     }
 
     /** When you get a property from an XMLRPC, it just returns another XMLRPC with the property name tacked onto methodname. */
-    public Object get(String name) {
-        return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name, http);
+    public Object get(Object name) {
+        return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name.toString(), http);
     }
 
     public XMLRPC(String url, String methodname) {
@@ -413,18 +419,18 @@ class XMLRPC extends JS.Callable {
     private static class Filter extends FilterInputStream {
         public Filter(InputStream is) { super(is); }
         public int read() throws IOException {
-            Thread.yield();
-            while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { };
+            java.lang.Thread.yield();
+            while(MessageQueue.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { };
             return super.read();
         }
         public int read(byte[] b) throws IOException {
-            Thread.yield();
-            while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { };
+            java.lang.Thread.yield();
+            while(MessageQueue.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { };
             return super.read(b);
         }
         public int read(byte[] b, int i, int j) throws IOException {
-            Thread.yield();
-            while(MessageQueue.nonThreadEventsInQueue > 0) try { Thread.sleep(100); } catch (Exception e) { };
+            java.lang.Thread.yield();
+            while(MessageQueue.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { };
             return super.read(b, i, j);
         }
     }