X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=263120dc2ed35babe3a968c146d5e82d8f639348;hb=8c1756ef3fd42cc2f324baf47e13a83f51045efe;hp=57a55fa592a6f3f008c27cd48e4778dc78f782fa;hpb=0a13b4988d4952f60f0b28770e6a2240315aecd3;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 57a55fa..263120d 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -1,338 +1,255 @@
-// 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.text.*;
 import java.util.*;
+import org.xwt.js.*;
 import org.xwt.util.*;
-import org.mozilla.javascript.*;
+import org.xwt.translators.*;
+import org.bouncycastle.util.encoders.Base64;
 
 /** Singleton class that provides all functionality in the xwt.* namespace */
-public final class XWT extends JSObject {
-
-    public static final XWT singleton = new XWT();
-
-    /** each key is a string representing a filename which the user has already given XWT permission to write to */
-    private static Hashtable safeFiles = new Hashtable();
-
-    public String getClassName() { return "XWT"; }
-    private XWT() { setSeal(true); }
+public final class XWT extends JSCallable {
+
+    public final Res rr;
+    public XWT(Res rr) { this.rr = rr; }
+
+    /** lets us put multi-level get/put/call keys all in the same method */
+    private class Sub extends JSCallable {
+        String key;
+        Sub(String key) { this.key = key; }
+        public String toString() { return "XWTSUB " + key; }
+        public void put(Object key, Object val) { XWT.this.put(this.key + "." + key, val); }
+        public Object get(Object key) { return XWT.this.get(this.key + "." + key); }
+        public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) {
+            return XWT.this.callMethod(this.key, a0, a1, a2, rest, nargs);
+        }
+        public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) {
+            return XWT.this.callMethod(this.key + "." + method, a0, a1, a2, rest, nargs);
+        }
+    }
 
-    public Object get(String name, Scriptable start) {
-        if (name == null) return null;
-        else if (name.equals("maxdim")) return new Integer(Short.MAX_VALUE);
-        else if (name.equals("parseFloat")) return JSObject.defaultObjects.get("parseFloat", null);
-        else if (name.equals("parseInt")) return JSObject.defaultObjects.get("parseInt", null);
-        else if (name.equals("alt")) return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
-        else if (name.equals("control")) return Surface.control ? Boolean.TRUE : Boolean.FALSE;
-        else if (name.equals("shift")) return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
-        else if (name.equals("date")) return date;
-        else if (name.equals("listfonts")) return listfonts;
-        else if (name.equals("regexp")) return regexp;
-        else if (name.equals("sleep")) return sleep;
-        else if (name.equals("yield")) return yield;
-        else if (name.equals("newBrowserWindow")) return newBrowserWindow;
-        else if (name.equals("textwidth")) return textwidth;
-        else if (name.equals("textheight")) return textheight;
-        else if (name.equals("newBox")) return newBox;
-        else if (name.equals("soap")) return soap;
-        else if (name.equals("xmlrpc")) return xmlrpc;
-        else if (name.equals("origin")) return Main.origin;
-        else if (name.equals("clipboard")) return Platform.getClipBoard();
-        else if (name.equals("altKeyName")) return Platform.altKeyName();
-        else if (name.equals("screenWidth")) return new Integer(Platform.getScreenWidth());
-        else if (name.equals("screenHeight")) return new Integer(Platform.getScreenHeight());
-        else if (name.equals("static")) return Static.getStatic("");
-        else if (name.equals("theme")) return theme;
-        else if (name.equals("openFile")) return openFile;
-        else if (name.equals("saveFile")) return saveFile;
-        else if (name.equals("saveFileAs")) return saveFileAs;
-        else if (name.equals("utfEncode")) return utfEncode;
-        else if (name.equals("fileSeparator")) return File.separator;
-        else if (name.equals("homeDir")) return System.getProperty("user.home");
-        else if (name.equals("tempDir")) return System.getProperty("java.io.tempdir");
-        else if (name.equals("recursivePrintObject")) return recursivePrintObject;
-        else if (name.equals("parseHTML")) return parseHTML;
-        else if (name.equals("button")) {
+    public Object get(Object name) {
+        //#switch(name)
+        case "math": return xwtMath;
+        case "string": return xwtString;
+        case "date": return METHOD;
+        case "origin": return Main.origin;
+        case "box": return new BoxTree();
+        case "log": return new Sub("log");
+        case "ui": return new Sub("ui");
+        case "thread": return new Sub("thread");
+        case "ui.key": return new Sub("ui.key");
+        case "ui.key.alt": return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
+        case "ui.key.control": return Surface.control ? Boolean.TRUE : Boolean.FALSE;
+        case "ui.key.shift": return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
+        case "ui.clipboard": return Platform.getClipBoard();
+        case "ui.maxdim": return new Integer(Short.MAX_VALUE);
+        case "ui.key.name": return new Sub("ui.key.name");
+        case "ui.key.name.alt": return Platform.altKeyName();
+        case "ui.screen": return new Sub("ui.screen");
+        case "ui.screen.width": return new Integer(Platform.getScreenWidth());
+        case "ui.screen.height": return new Integer(Platform.getScreenHeight());
+        case "fs.home": return System.getProperty("user.home");
+        case "fs.temp": return System.getProperty("java.io.tempdir");
+        case "ui.mouse": return new Sub("ui.mouse");
+        case "res": return new Sub("res");
+        case "ui.mouse.button":
             if (Surface.button1 && !Surface.button2 && !Surface.button3) return new Integer(1);
-            else if (!Surface.button1 && Surface.button2 && !Surface.button3) return new Integer(1);
-            else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(1);
+            else if (!Surface.button1 && Surface.button2 && !Surface.button3) return new Integer(2);
+            else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(3);
             else return new Integer(0);
-        }
-        else if (name.equals("println")) return println;
-        else if (name.equals("math")) return org.xwt.util.JSObject.defaultObjects.get("Math", null);
-        else return super.get(name, start);
+        case "undocumented": return new Sub("undocumented");
+        case "undocumented.internal": return new Sub("undocumented.internal");
+        case "thread.yield": return METHOD;
+        case "thread.sleep": return METHOD;
+        case "res.watch": return METHOD;
+        case "soap": return METHOD;
+        case "apply": return METHOD;
+        case "graft": return METHOD;
+        case "ui.browser": return METHOD;
+        case "clone": return METHOD;
+        case "res.unzip": return METHOD;
+        case "res.uncab": return METHOD;
+        case "res.cache": return METHOD;
+        case "res.url": return METHOD;
+        case "log.println": return METHOD;
+        case "log.dump": return METHOD;
+        case "regexp": return METHOD;
+        case "rpc.xml": return METHOD;
+        case "rpc.soap": return METHOD;
+        case "crypto.rsa": return METHOD;
+        case "crypto.md5": return METHOD;
+        case "crypto.sha1": return METHOD;
+        case "crypto.rc4": return METHOD;
+        case "stream.parse.html": return METHOD;
+        case "stream.parse.xml": return METHOD;
+        case "stream.parse.utf8": return METHOD;
+        //#end
+        return null;
     }
 
-    public void put(String name, Scriptable start, Object value) {
-        if (name == null) return;
-        else if (name.equals("thread") && value != null && value instanceof Function) ThreadMessage.newthread((Function)value);
-        else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
-        else super.put(name, start, value);
+    public void put(Object name, final Object value) {
+        //#switch(name)
+        case "thread":
+            Scheduler.add(new Scheduler.Task() { public void perform() { JSContext.invokePauseable((JSFunction)value); } });
+        case "ui.clipboard": Platform.setClipBoard((String)value);
+        case "ui.frame": Platform.createSurface((Box)value, true, true);
+        case "ui.window": Platform.createSurface((Box)value, false, true);
+        case "undocumented.internal.proxyAuthorization":
+            HTTP.Proxy.Authorization.authorization = value.toString();
+            HTTP.Proxy.Authorization.waitingForUser.release();
+        //#end
     }
 
-
-    // JSFunction Instances ///////////////////////////////////////////////////////////////////
-
-    /** Helper class for defining functions. */
-    private static abstract class JSFunction extends JSObject implements Function {
-        JSFunction() { setSeal(true); }
-        public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; }
+    public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JS.Exn {
+        if (name.equals("date")) {
+            JSArray args = new JSArray();
+            for(int i=0; i<nargs; i++) args.addElement(i==0?a:i==1?b:i==2?c:rest[i-3]);
+            return new org.xwt.js.JSDate(args);
+        }
+        else if (nargs == 0 && name.equals("thread.yield")) { sleep(0); return null; }
+        else if (nargs == 2) {
+            //#switch(name)
+            case "res.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b);
+            case "soap": return new SOAP((String)a, "", (String)b, null);
+            case "apply":
+                Template.getTemplate((Res)b).apply((Box)a, XWT.this);
+                return a;
+            //#end
+        } else if (nargs == 3 && name.equals("soap")) {
+            if (name.equals("soap")) {
+                return new SOAP((String)a, "", (String)b, (String)c);
+            } else if (name.equals("graft")) {
+                if (a instanceof Box) throw new JS.Exn("can't graft onto Boxes (yet)");
+                if (a instanceof Number) throw new JS.Exn("can't graft onto Numbers (yet)");
+                if (a instanceof String) throw new JS.Exn("can't graft onto Strings (yet)");
+                if (a instanceof Res) return new Res.Graft((Res)a, b, c);
+                return new JS.Graft((JS)a, b, c);
+            }
+        } else if (nargs == 1) {
+            //#switch(name)
+            case "ui.browser": Platform.newBrowserWindow((String)a); return null;
+            case "clone": return new XWT((Res)a);
+            case "res.unzip": return new Res.Zip((Res)a);
+            case "res.uncab": return new Res.Cab((Res)a);
+            case "res.cache": try { return new Res.CachedRes((Res)a, "resources", true); }
+                              catch (Res.NotCacheableException e) { throw new JS.Exn("this resource cannot be cached"); }
+            case "res.url":
+                String url = (String)a;
+                if (url.startsWith("http://")) return new Res.HTTP(url);
+                else if (url.startsWith("https://")) return new Res.HTTP(url);
+                else if (url.startsWith("data:")) return new Res.ByteArray(Base64.decode(url.substring(5)), null);
+                else if (url.startsWith("utf8:")) return new Res.ByteArray(url.substring(5).getBytes(), null);
+                throw new JS.Exn("invalid resource specifier " + url);
+            case "thread.sleep": sleep(JS.toInt(a)); return null;
+            case "log.println": Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
+            case "log.dump": Log.recursiveLog("","",a); return null;
+            case "regexp": return new JSRegexp(a, null);
+            case "rpc.xml": return new XMLRPC((String)a, "");
+            case "rpc.soap": return new SOAP((String)a, "", null, null);
+            case "crypto.rsa": /* FEATURE */ break;
+            case "crypto.md5": /* FEATURE */ break;
+            case "crypto.sha1": /* FEATURE */ break;
+            case "crypto.rc4": /* FEATURE */ break;
+            case "stream.parse.html": /* FEATURE */ break;
+            case "stream.parse.xml": /* FEATURE */ break;
+            case "stream.parse.utf8": /* FEATURE */ break;
+            //#end
+        }
+        return null;
     }
 
-    private static final JSFunction newBrowserWindow = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 1 || args[0] == null) return null;
-                Platform.newBrowserWindow(args[0].toString());
-                return null;
-            }
-        };
-
-    private static final JSFunction yield = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                sleep.call(cx, null, null, null);
-                return null;
-            }
-        };
-
-    private static final JSFunction println = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length == 1)
-                    if (Log.on)
-                        Log.log(cx.interpreterSourceFile, args[0] == null ? "null" : args[0].toString());
-                return null;
-            }
-        };
-
-    private static final JSFunction date = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "Date", args);
-                } catch (Exception e) {
-                    if (Log.on) Log.log(this, "Exception in Context.newObject() -- this should never happen");
-                    if (Log.on) Log.log(this, e);
-                    return null;
-                }
+    public static void sleep(final int i) {
+        final Callback callback = JSContext.pause();
+        final long currentTime = System.currentTimeMillis();
+        new Thread() {
+            public void run() {
+                try { Thread.sleep(i); } catch (InterruptedException e) { }
+                Scheduler.add(new Scheduler.Task() { public void perform() { callback.call(null); } });
             }
-        };
-
-    private static final JSFunction regexp = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "RegExp", args);
-                } catch (Exception e) {
-                    if (Log.on) Log.log(this, "Exception in Context.newObject() -- this should never happen");
-                    if (Log.on) Log.log(this, e);
-                    return null;
-                }
-            }
-        };
-
-    private static final JSFunction listfonts = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                return Context.enter().newArray(org.xwt.util.JSObject.defaultObjects,  Platform.listFonts());
-            }
-        };
-
-    private static final JSFunction theme = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 2) return null;
-                if (args[0] == null || args[1] == null) return null;
-                Template.retheme(args[0].toString(), args[1].toString());
-                return null;
-            }
-        };
-
-    private static final JSFunction xmlrpc = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 1 || args[0] == null) return null;
-                return new XMLRPC(args[0].toString(), "");
-            }
-        };
-
-    private static final JSFunction soap = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length == 1 && args[0] != null) return new SOAP(args[0].toString(), "", null, null);
-                else if (args.length == 2 && args[0] != null && args[1] != null)
-                    return new SOAP(args[0].toString(), "", args[1].toString(), null);
-                else if (args.length == 3 && args[0] != null && args[1] != null && args[2] != null)
-                    return new SOAP(args[0].toString(), "", args[1].toString(), args[2].toString());
-                else return null;
-            }
-        };
-
-    private static final JSFunction textwidth = new JSFunction() {
-            public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) throws JavaScriptException {
-                if (args.length < 1 || args.length > 2) return null;
-                if (args[0] == null || (args.length == 2 && args[1] == null)) return null;
-                String font = args.length == 1 ? Platform.getDefaultFont() : args[0].toString();
-                String text = args.length == 1 ? args[0].toString() : args[1].toString();
-                XWF xwf = XWF.getXWF(font);
-                if (xwf == null) return new Integer(Platform.stringWidth(font, text));
-                else return new Integer(xwf.stringWidth(text));
-            }
-        };
-
-
-    private static final JSFunction textheight = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length > 1) return null;
-                if (args.length == 1 && args[0] == null) return null;
-                String font = args.length == 0 || args[0] == null ? Platform.getDefaultFont() : args[0].toString();
-                XWF xwf = XWF.getXWF(font);
-                if (xwf == null) return new Integer(Platform.getMaxAscent(font) + Platform.getMaxDescent(font));
-                else return new Integer(xwf.getMaxAscent() + xwf.getMaxDescent());
-            }
-        };
-
-    private static final JSFunction newBox = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                Box ret = new Box(args.length == 0 || args[0] == null ? "box" : args[0].toString(), Template.defaultImportList);
-                for(int i=1; i<args.length; i++)
-                    if (args[i] instanceof Box)
-                        ret.put(ret.numChildren(), null, (Box)args[i]);
-                for(int i=1; i<args.length; i++)
-                    if (args[i] instanceof Scriptable && !(args[i] instanceof Box)) {
-                        Scriptable s = (Scriptable)args[i];
-                        Object[] keys = s.getIds();
-
-                        // FIXME: need to ensure that this is putGlobally(), but still run traps...
-                        for(int j=0; j<keys.length; j++) ret.put(keys[j].toString(), null, s.get(keys[j].toString(), s));
-                    }
-                return ret;
-            }
-        };
-
-    private static final JSFunction sleep = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args != null && (args.length != 1 || args[0] == null)) return null;
-                int i = args == null ? 0 : SpecialBoxProperty.stoi(args[0].toString());
-
-                Thread thread = Thread.currentThread();
-                if (!(thread instanceof ThreadMessage)) {
-                    if (Log.on) Log.log(this, "cannot sleep() or yield() in the foreground thread");
-                    return null;
-                }
-                ThreadMessage mythread = (ThreadMessage)thread;
-                mythread.done.release();
-
-                if (i > 0) try { Thread.sleep(i); } catch (Exception e) { }
-                
-                MessageQueue.add(mythread);
-                mythread.go.block();
+        }.start();
+    }
+    
+    public static final JSMath xwtMath = new JSMath() {
+            private JS gs = new JSScope.Global(null);
+            public String toString() { return "XWTMATH"; }
+            public Object get(Object key) {
+                //#switch(key)
+                case "isNaN": return gs.get("isNaN");
+                case "isFinite": return gs.get("isFinite");
+                case "NaN": return gs.get("NaN");
+                case "Infinity": return gs.get("Infinity");
+                //#end
+                return super.get(key);
+            }
+        };
+
+    public static final JS xwtString = new JS() {
+            private JS gs = new JSScope.Global(null);
+            public void put(Object key, Object val) { }
+            public Object get(Object key) {
+                //#switch(key)
+                case "parseInt": return gs.get("parseInt");
+                case "parseFloat": return gs.get("parseFloat");
+                case "decodeURI": return gs.get("decodeURI");
+                case "decodeURIComponent": return gs.get("decodeURIComponent");
+                case "encodeURI": return gs.get("encodeURI");
+                case "encodeURIComponent": return gs.get("encodeURIComponent");
+                case "escape": return gs.get("escape");
+                case "unescape": return gs.get("unescape");
+                case "fromCharCode": return gs.get("stringFromCharCode");
+                //#end
                 return null;
             }
         };
 
-    private static final JSFunction openFile = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 1) return null;
-                String file = Platform.fileDialog(args[0].toString(), false);
-                return file == null ? null : new ByteStream(file);
-            }
-        };
-
-    private static final JSFunction saveFile = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 2) return null;
-                if (!(args[1] instanceof ByteStream)) return null;
-                String file = args[0].toString();
-                if (safeFiles.get(Platform.isCaseSensitive() ? file : file.toLowerCase()) == null) {
-                    file = Platform.fileDialog(file, true);
-                    if (file == null) return null;
-                    safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
-                }
-                try {
-                    ((ByteStream)args[1]).writeTo(new FileOutputStream(file));
-                    return null;
-                } catch (IOException e) {
-                    if (Log.on) Log.log(ByteStream.class, "IO Exception while writing a ByteStream to a file");
-                    if (Log.on) Log.log(ByteStream.class, e);
-                    throw new JavaScriptException("error while writing a ByteStream to a file");
-                }
-            }
-        };
-
-    private static final JSFunction saveFileAs = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args.length != 2) return null;
-                if (!(args[1] instanceof ByteStream)) return null;
-                String file = args[0].toString();
-                file = Platform.fileDialog(file, true);
-                if (file == null) return null;
-                safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
-                try {
-                    ((ByteStream)args[1]).writeTo(new FileOutputStream(file));
-                    return null;
-                } catch (IOException e) {
-                    if (Log.on) Log.log(ByteStream.class, "IO Exception while writing a ByteStream to a file");
-                    if (Log.on) Log.log(ByteStream.class, e);
-                    throw new JavaScriptException("error while writing a ByteStream to a file");
-                }
-            }
-        };
-
-    private static final JSFunction utfEncode = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args == null || args.length != 1) return null;
-                return new ByteStream(args[0].toString().getBytes());
-            }
-        };
-
-    
-    private static final JSFunction parseHTML = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args == null || args.length != 1) return null;
-                try {
-                    if (args[0] instanceof ByteStream) {
-                        return HTML.parseReader(new InputStreamReader(((ByteStream)args[0]).getInputStream()));
-                    } else {
-                        return HTML.parseReader(new StringReader(args[0].toString()));
-                    }
-                } catch (IOException e) {
-                    if (Log.on) Log.log(HTML.class, "IO Exception while parsing HTML");
-                    if (Log.on) Log.log(HTML.class, e);
-                    throw new JavaScriptException("error while parsing HTML");
-                }
+    private class XMLHelper extends XML {
+        Vector obStack = new Vector();
+        public XMLHelper() { super(BUFFER_SIZE); }
+        public void startElement(XML.Element c) throws XML.SchemaException {
+            JS o = new JS();
+            o.put("$name", c.localName);
+            for(int i=0; i<c.len; i++) o.put(c.keys[i], c.vals[i]);
+            o.put("$numchildren", new Integer(0));
+            obStack.addElement(o);
+        }
+        public void endElement(XML.Element c) throws XML.SchemaException {
+            if (obStack.size() == 1) return;
+            JS me = (JS)obStack.lastElement();
+            obStack.setSize(obStack.size() - 1);
+            JS parent = (JS)obStack.lastElement();
+            int numchildren = ((Integer)parent.get("$numchildren")).intValue();
+            parent.put("$numchildren", new Integer(numchildren + 1));
+            parent.put(new Integer(numchildren), me);
+        }
+        public void characters(char[] ch, int start, int length) throws XML.SchemaException {
+            String s = new String(ch, start, length);
+            JS parent = (JS)obStack.lastElement();
+            int numchildren = ((Integer)parent.get("$numchildren")).intValue();
+            Object lastChild = parent.get(new Integer(numchildren - 1));
+            if (lastChild instanceof String) {
+                parent.put(new Integer(numchildren - 1), lastChild + s);
+            } else {
+                parent.put("$numchildren", new Integer(numchildren + 1));
+                parent.put(new Integer(numchildren), s);
             }
-        };
-    
-    private static void recurse(String indent, String name, Object o, Context cx) {
-        if (!name.equals("")) name += " : ";
-
-        if (o == null) {
-            Log.log(cx.interpreterSourceFile, indent + name + "<null>");
-
-        } else if (o instanceof NativeArray) {
-            Log.log(cx.interpreterSourceFile, indent + name + "<array>");
-            NativeArray na = (NativeArray)o;
-            for(int i=0; i<na.jsGet_length(); i++)
-                recurse(indent + "  ", i + "", na.get(i, null), cx);
-
-        } else if (!(o instanceof NativeDate) && (o instanceof JSObject || o instanceof ScriptableObject)) {
-            Log.log(cx.interpreterSourceFile, indent + name + "<object>");
-            Scriptable s = (Scriptable)o;
-            Object[] keys = s.getIds();
-            for(int i=0; i<keys.length; i++)
-                recurse(indent + "  ", keys[i].toString(),
-                        keys[i] instanceof Integer ? s.get(((Integer)keys[i]).intValue(), null) : s.get(keys[i].toString(), null), cx);
-
-        } else {
-            Log.log(cx.interpreterSourceFile, indent + name + o);
-
+        }
+        public void whitespace(char[] ch, int start, int length) {}
+        public JS doParse(InputStream is) throws JS.Exn {
+            try { 
+                BufferedReader r = new BufferedReader(new InputStreamReader(is));
+                parse(r);
+            } catch (XML.XMLException e) {
+                throw new JS.Exn("error parsing XML: " + e.toString());
+            } catch (IOException e) {
+                if (Log.on) Log.log(this, "IO Exception while reading from file");
+                if (Log.on) Log.log(this, e);
+                throw new JS.Exn("error reading from Resource");
+            }
+            return obStack.size() >= 1 ? (JS)obStack.elementAt(0) : null;
         }
     }
-
-    private static final JSFunction recursivePrintObject = new JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args == null || args.length != 1) return null;
-                recurse("", "", args[0], cx);
-                return null;
-            }
-        };
-
 }
-
-
-
-
-