reorganized file layout (part 2: edits)

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

diff --git a/src/org/ibex/net/XMLRPC.java b/src/org/ibex/net/XMLRPC.java
index 607d34e..14aacb5 100644 (file)
--- a/src/org/ibex/net/XMLRPC.java
+++ b/src/org/ibex/net/XMLRPC.java
@@ -1,11 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.ibex;
+package org.ibex.net;
 
 import java.io.*;
 import java.util.*;
 import org.ibex.js.*;
 import org.ibex.util.*;
-import org.bouncycastle.util.encoders.Base64;
+import org.ibex.crypto.*;
 
 /**
  *  An XML-RPC client implemented as a JavaScript Host Object. See the
@@ -29,7 +29,7 @@ import org.bouncycastle.util.encoders.Base64;
  *         convert.
  *  </ol>
  */
-class XMLRPC extends JS {
+public class XMLRPC extends JS {
 
     public XMLRPC(String url, String method) {
         this.http = url.startsWith("stdio:") ? HTTP.stdio : new HTTP(url);
@@ -329,20 +329,20 @@ class XMLRPC extends JS {
             try {
                 new Helper().parse(br);
                 final Object result = fault ? new JSExn(objects.elementAt(0)) : objects.size() == 0 ? null : objects.elementAt(0);
-                Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(result); }});
+                Scheduler.add(new Task() { public void perform() throws JSExn { callback.unpause(result); }});
             } finally {
                 tracker.clear();
                 objects.setSize(0);
             }
         } catch (final JSExn e) {
             final Exception e2 = e;
-            Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(e2); }});
+            Scheduler.add(new Task() { public void perform() throws JSExn { callback.unpause(e2); }});
         } catch (final IOException e) {
             final Exception e2 = e;
-            Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }});
+            Scheduler.add(new Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }});
         } catch (final XML.Exn e) {
             final Exception e2 = e;
-            Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }});
+            Scheduler.add(new Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }});
         }
     }
 }