From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:41:01 +0000 (+0000)
Subject: 2003/11/05 06:22:10
X-Git-Tag: RC3~371
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f11aab193c3ed2594d03d66b6adb869564686bc0;p=org.ibex.core.git

2003/11/05 06:22:10

darcs-hash:20040130074101-2ba56-73fba783bf27dbb907810b4e2a6708a9644b61f2.gz
---

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java
similarity index 100%
rename from src/org/xwt/Box.java.pp
rename to src/org/xwt/Box.java
diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 53514ed..8b0fef7 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -16,187 +16,98 @@ public final class XWT extends JS.Obj {
     public final Res rr;
     public XWT(Res rr) { this.rr = rr; }
 
-    private final JS xwtMath = new XWTMath();
-    private final JS xwtString = new XWTString();
-
     public Object get(Object name) {
-        if (name.equals("alt")) return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
-        else if (name.equals("box")) return new Box();
-        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("clipboard")) return Platform.getClipBoard();
-        else if (name.equals("origin")) return Main.origin;
-        else if (name.equals("maxdim")) return new Integer(Short.MAX_VALUE);
-        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("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("math")) return xwtMath;
-        else if (name.equals("string")) return xwtString;
-        else if (name.equals("button")) {
+        //#switch(name)
+        case "math": return xwtMath;
+        case "string": return xwtString;
+        case "date": return new org.xwt.js.Date();
+        case "origin": return Main.origin;
+        case "box": return new Box();
+        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.alt.name": return Platform.altKeyName();
+        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.button":
             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 return rr.get(name);
+        //#end
+        return rr.get(name);
     }
 
     public Object put(Object name, final Object value) {
-        if (name.equals("thread") && value != null && (value instanceof JS.Callable || value instanceof Function)) {
-            Scheduler.add(new Scheduler.Task() { public void perform() {
-                new JS.Context((Function)value, null).resume();
-            } });
-        } else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
-        else if (name.equals("frame")) Platform.createSurface((Box)value, true, true);
-        else if (name.equals("window")) Platform.createSurface((Box)value, false, true);
-        else if (name.equals("proxyAuthorization")) {
+        //#switch(name)
+        case "thread":
+            Scheduler.add(new Scheduler.Task() { public void perform() { new JS.Context((Function)value, null).resume(); } });
+            return null;
+        case "ui.clipboard": Platform.setClipBoard((String)value); return null;
+        case "ui.frame": Platform.createSurface((Box)value, true, true); return null;
+        case "ui.window": Platform.createSurface((Box)value, false, true); return null;
+        case "undocumented.internal.proxyAuthorization":
             HTTP.Proxy.Authorization.authorization = value.toString();
             HTTP.Proxy.Authorization.waitingForUser.release();
-        } else return super.put(name, value);
-        return null;
-    }
-
-    public Object callMethod(Object method, JS.Array args, boolean checkOnly) {
-
-        if (method.equals("newBrowserWindow")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.length() != 1 || args.elementAt(0) == null) return null;
-            Platform.newBrowserWindow(args.elementAt(0).toString());
-            return null;
-
-        } else if (method.equals("clone")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new XWT((Res)args.elementAt(0));
-
-        } else if (method.equals("graft")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.elementAt(0) instanceof Box) throw new JS.Exn("can't graft onto Boxes (yet)");
-            if (args.elementAt(0) instanceof Number) throw new JS.Exn("can't graft onto Numbers (yet)");
-            if (args.elementAt(0) instanceof String) throw new JS.Exn("can't graft onto Strings (yet)");
-            if (args.elementAt(0) instanceof Res)
-                return new Res.Graft((Res)args.elementAt(0), args.elementAt(1), args.elementAt(2));
-            return new JS.Graft((JS)args.elementAt(0), args.elementAt(1), args.elementAt(2));
-
-        } else if (method.equals("unzip")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Res.Zip((Res)args.elementAt(0));
-
-        } else if (method.equals("uncab")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Res.Cab((Res)args.elementAt(0));
-
-        } else if (method.equals("cache")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Res.CachedRes((Res)args.elementAt(0), "resources", true);
-
-        } else if (method.equals("watchProgress")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Res.ProgressWatcher((Res)args.elementAt(0), (Function)args.elementAt(1));
-
-        } else if (method.equals("yield")) {
-            if (checkOnly) return Boolean.TRUE;
-            return sleep(0);
-
-        } else if (method.equals("load")) {
-            if (checkOnly) return Boolean.TRUE;
-            return Res.stringToRes(args.elementAt(0).toString());
-
-        } else if (method.equals("println")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.length() != 1) return null;
-            if (Log.on) Log.logJS(this, (args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
-            return null;
-
-        } else if (method.equals("date")) {
-            if (checkOnly) return Boolean.TRUE;
-            Log.log(XWT.class, "date not implemented");
             return null;
-
-        } else if (method.equals("regexp")) {
-            if (checkOnly) return Boolean.TRUE;
-            return new Regexp(args);
-
-        } else if (method.equals("apply")) {
-            if (checkOnly) return Boolean.TRUE;
-            Box b = (Box)args.elementAt(0);
-            Template.getTemplate((Res)args.elementAt(1)).apply(b, null, this);
-            return b;
-
-        } else if (method.equals("xmlrpc")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.length() != 1 || args.elementAt(0) == null) return null;
-            return new XMLRPC(args.elementAt(0).toString(), "");
-
-        } else if (method.equals("soap")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.length() == 1 && args.elementAt(0) != null) return new SOAP(args.elementAt(0).toString(), "", null, null);
-            else if (args.length() == 2 && args.elementAt(0) != null && args.elementAt(1) != null)
-                return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), null);
-            else if (args.length() == 3 && args.elementAt(0) != null && args.elementAt(1) != null && args.elementAt(2) != null)
-                return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), args.elementAt(2).toString());
-            else return null;
-
-        } else if (method.equals("sleep")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args != null && (args.length() != 1 || args.elementAt(0) == null)) return null;
-            int i = args == null ? 0 : Box.stoi(args.elementAt(0).toString());
-            return sleep(i);
-
-        } else if (method.equals("parseHTML")) {
-            if (checkOnly) return Boolean.TRUE;
-                if (args == null || args.length() != 1 || args.elementAt(0) == null) return null;
-                try {
-                    if (args.elementAt(0) instanceof Res) {
-                        return HTML.parseReader(new InputStreamReader(((Res)args.elementAt(0)).getInputStream()));
-                    } else {
-                        return HTML.parseReader(new StringReader(args.elementAt(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 JS.Exn("error while parsing HTML");
-                }
-
-        } else if (method.equals("recursivePrintObject")) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.length() != 1) return null;
-            recurse("", "", args.elementAt(0));
-            return null;
-        }
-            
-        if (checkOnly) return Boolean.FALSE;
-        return null;
+        //#end
+        return super.put(name, value);
     }
 
-    private static void recurse(String indent, String name, Object o) {
-        if (!name.equals("")) name += " : ";
-
-        if (o == null) {
-            Log.logJS(indent + name + "<null>");
-
-        } else if (o instanceof JS.Array) {
-            Log.logJS(indent + name + "<array>");
-            JS.Array na = (JS.Array)o;
-            for(int i=0; i<na.length(); i++)
-                recurse(indent + "  ", i + "", na.elementAt(i));
-
-        } else if (o instanceof JS) {
-            Log.logJS(indent + name + "<object>");
-            JS s = (JS)o;
-            Object[] keys = s.keys();
-            for(int i=0; i<keys.length; i++)
-                if (keys[i] != null)
-                    recurse(indent + "  ", keys[i].toString(),
-                            (keys[i] instanceof Integer) ?
-                            s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
-
-        } else {
-            Log.logJS(indent + name + o);
-
+    public Object callMethod(Object name, boolean checkOnly, JS.Array args) throws JS.Exn {
+        Object a = args.elementAt(0);
+        Object b = args.elementAt(1);
+        Object c = args.elementAt(2);
+        if (name.equals("date")) return new org.xwt.js.Date(args);
+        else if (args.length() == 0 && name.equals("thread.yield")) return checkOnly ? T : sleep(0);
+        else if (args.length() == 2) {
+            //#switch(name)
+            case "res.watch": return checkOnly ? T : new Res.ProgressWatcher((Res)a, (Function)b);
+            case "soap": return checkOnly ? T : new SOAP((String)args.elementAt(0), "", (String)args.elementAt(1), null);
+            case "apply": if (checkOnly) return T;
+                Template.getTemplate((Res)args.elementAt(1)).apply((Box)args.elementAt(0), null, XWT.this);
+                return args.elementAt(0);
+            //#end
+        } else if (args.length() == 3 && name.equals("soap")) {
+            if (name.equals("soap")) {
+                if (checkOnly) return T;
+                return new SOAP((String)args.elementAt(0), "", (String)args.elementAt(1), (String)args.elementAt(2));
+            } else if (name.equals("graft")) {
+                if (checkOnly) return T;
+                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)");
+                // FIXME if (a instanceof Res) return new Res.Graft((Res)a, b, c);
+                return new JS.Graft((JS)a, b, c);
+            }
+        } else if (args.length() == 1) {
+            //#switch(name)
+            case "ui.browser": if (checkOnly) return T; Platform.newBrowserWindow((String)a); return null;
+            case "clone": return checkOnly ? T : new XWT((Res)a);
+            case "res.unzip": return checkOnly ? T : new Res.Zip((Res)a);
+            case "res.uncab": return checkOnly ? T : new Res.Cab((Res)a);
+            case "res.cache": return checkOnly ? T : new Res.CachedRes((Res)a, "resources", true);
+            case "res.fromURL": return checkOnly ? T : Res.stringToRes((String)a);
+            case "thread.sleep": return checkOnly ? T : sleep(JS.toInt(a));
+            case "log.println": if (checkOnly) return T; Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
+            case "log.dump": if (checkOnly) return T; JS.recurse("", "", a); return null;
+            case "regexp": return checkOnly ? T : new Regexp(a, null);
+            case "rpc.xml": return checkOnly ? T : new XMLRPC((String)a, "");
+            case "rpc.soap": return checkOnly ? T : new SOAP((String)a, "", null, null);
+            case "crypto.rsa": /* FIXME */ break;
+            case "crypto.md5": /* FIXME */ break;
+            case "crypto.sha1": /* FIXME */ break;
+            case "crypto.rc4": /* FIXME */ break;
+            case "stream.parse.html": /* FIXME */ break;
+            case "stream.parse.xml": /* FIXME */ break;
+            case "stream.parse.utf8": /* FIXME */ break;
+            //#end
         }
+        return super.callMethod(name, args, checkOnly);
     }
 
     // FIXME
@@ -211,34 +122,34 @@ public final class XWT extends JS.Obj {
         return JS.Context.pause;
     }
     
-    private static class XWTMath extends org.xwt.js.Math {
-        public XWTMath() {
-            JS gs = new JS.GlobalScope();
-            put("isNaN",gs.get("isNaN"));
-            put("isFinite",gs.get("isFinite"));
-            put("NaN",gs.get("NaN"));
-            put("Infinity",gs.get("Infinity"));
-            setSeal(true);
-        }
-        public Object get(Object key) {
-            Object ret = super.get(key);
-            if(ret == null) ret = org.xwt.js.Math.singleton.get(key);
-            return ret;
-        }
-    }
-    private static class XWTString extends JS.Obj {
-        public XWTString() {
-            JS gs = new JS.GlobalScope();
-            put("parseInt",gs.get("parseInt"));
-            put("parseFloat",gs.get("parseFloat"));
-            put("decodeURI",gs.get("decodeURI"));
-            put("decodeURIComponent",gs.get("decodeURIComponent"));
-            put("encodeURI",gs.get("encodeURI"));
-            put("encodeURIComponent",gs.get("encodeURIComponent"));
-            put("escape",gs.get("escape"));
-            put("unescape",gs.get("unescape"));
-            put("fromCharCode",gs.get("stringFromCharCode"));
-            setSeal(true);
-        }
-    }
+    public static final org.xwt.js.Math xwtMath = new org.xwt.js.Math() {
+            private JS gs = new JS.GlobalScope();
+            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.Obj xwtString = new JS.Obj(true) {
+            private JS gs = new JS.GlobalScope();
+            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 super.get(key);
+            }
+        };
 }
diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java
index 635d4e5..79800fe 100644
--- a/src/org/xwt/js/JS.java
+++ b/src/org/xwt/js/JS.java
@@ -80,12 +80,17 @@ public abstract class JS {
     public abstract Object get(Object key) throws JS.Exn; 
     public abstract Object put(Object key, Object val) throws JS.Exn; 
     public abstract Object[] keys(); 
+
     public Object callMethod(Object method, Array args, boolean checkOnly) throws JS.Exn {
-	if (checkOnly) return Boolean.FALSE;
+        if(checkOnly) return Boolean.FALSE;
 	Object o = get(method);
-	if (o instanceof JS.Callable) return ((JS.Callable)o).call(args);
-        else if (o == null) throw new JS.Exn("Attempted to call non-existent method: " + method);
-        else throw new JS.Exn("Attempted to call a non-function: " +method);
+	if(o instanceof JS.Callable) {
+	    return ((JS.Callable)o).call(args);
+	} else if(o == null) {
+	    throw new JS.Exn("Attempted to call non-existent method: " + method);
+	} else {
+	    throw new JS.Exn("Attempted to call a non-method: " +method);
+	}
     }
     
     public Number coerceToNumber() { throw new JS.Exn("tried to coerce a JavaScript object to a Number"); }
@@ -98,6 +103,9 @@ public abstract class JS {
 
     /** A sensible implementation of the abstract methods in the JS class */
     public static class Obj extends JS {
+        // this gets around a wierd fluke in the Java type checking rules for ?..:
+        public static final Object T = Boolean.TRUE;
+        public static final Object F = Boolean.FALSE;
         private Hash entries = null;
         private boolean sealed = false;
         public Obj() { this(false); }
@@ -264,6 +272,35 @@ public abstract class JS {
         }
 
     }
+
+    public static void recurse(String indent, String name, Object o) {
+        if (!name.equals("")) name += " : ";
+
+        if (o == null) {
+            Log.logJS(indent + name + "<null>");
+
+        } else if (o instanceof JS.Array) {
+            Log.logJS(indent + name + "<array>");
+            JS.Array na = (JS.Array)o;
+            for(int i=0; i<na.length(); i++)
+                recurse(indent + "  ", i + "", na.elementAt(i));
+
+        } else if (o instanceof JS) {
+            Log.logJS(indent + name + "<object>");
+            JS s = (JS)o;
+            Object[] keys = s.keys();
+            for(int i=0; i<keys.length; i++)
+                if (keys[i] != null)
+                    recurse(indent + "  ", keys[i].toString(),
+                            (keys[i] instanceof Integer) ?
+                            s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
+
+        } else {
+            Log.logJS(indent + name + o);
+
+        }
+    }
+
 } 
 
 
diff --git a/src/org/xwt/js/Regexp.java b/src/org/xwt/js/Regexp.java
index 8179123..834a425 100644
--- a/src/org/xwt/js/Regexp.java
+++ b/src/org/xwt/js/Regexp.java
@@ -7,9 +7,7 @@ public class Regexp extends JS.Obj {
     private RE re;
     private int lastIndex;
     
-    public Regexp(JS.Array args) throws JS.Exn {
-        if(args.length() < 1) throw new JS.Exn("Not enough args to regexp");
-        Object arg0 = args.elementAt(0);
+    public Regexp(Object arg0, Object arg1) throws JS.Exn {
         if(arg0 instanceof Regexp) {
             Regexp r = (Regexp) arg0;
             this.global = r.global;
@@ -19,7 +17,7 @@ public class Regexp extends JS.Obj {
             String pattern = arg0.toString();
             String sFlags = null;
             int flags = 0;
-            if(args.length() == 2) sFlags = args.elementAt(1).toString();
+            if(arg1 != null) sFlags = (String)arg1;
             if(sFlags == null) sFlags = "";
             for(int i=0;i<sFlags.length();i++) {
                 switch(sFlags.charAt(i)) {