2003/11/13 09:57:57

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

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 99bd691..a9feb45 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -22,7 +22,7 @@ public final class XWT extends JSCallable {
         Sub(String key) { this.key = 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 method, JSArray args) { return XWT.call(method == null ? key : this.key + "." + method, args); }
+        public Object call(Object method, JSArray args) { return XWT.this.call(method == null ? key : this.key + "." + method, args); }
     }
 
     public Object get(Object name) {
@@ -32,28 +32,30 @@ public final class XWT extends JSCallable {
         case "date": return new JSDate();
         case "origin": return Main.origin;
         case "box": return new BoxTree();
-        case "ui": return sub("ui");
-        case "ui.key": return sub("ui.key");
+        case "log": return new Sub("log");
+        case "ui": return new Sub("ui");
+        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 sub("ui.key.name");
+        case "ui.key.name": return new Sub("ui.key.name");
         case "ui.key.name.alt": return Platform.altKeyName();
-        case "ui.screen": return sub("ui.screen");
+        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 sub("ui.mouse");
+        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(2);
             else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(3);
             else return new Integer(0);
-        case "undocumented": return sub("undocumented");
-        case "undocumented.internal": return sub("undocumented.internal");
+        case "undocumented": return new Sub("undocumented");
+        case "undocumented.internal": return new Sub("undocumented.internal");
         //#end
         return rr.get(name);
     }
@@ -61,7 +63,7 @@ public final class XWT extends JSCallable {
     public void put(Object name, final Object value) {
         //#switch(name)
         case "thread":
-            Scheduler.add(new Scheduler.Task() { public void perform() { JSContext.newJSContext((JSFunction)value, null); } });
+            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);
@@ -101,11 +103,12 @@ public final class XWT extends JSCallable {
             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": return new Res.CachedRes((Res)a, "resources", true);
-            case "res.fromURL": return Res.fromString((String)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": return Res.fromString((String)a);
             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": JS.recurse("", "", a); 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);
@@ -169,9 +172,9 @@ public final class XWT extends JSCallable {
         public XMLHelper() { super(BUFFER_SIZE); }
         public void startElement(XML.Element c) throws XML.SchemaException {
             JS o = new JSObj();
-            o.put("$name", c.localName, null);
+            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), null);
+            o.put("$numchildren", new Integer(0));
             obStack.addElement(o);
         }
         public void endElement(XML.Element c) throws XML.SchemaException {
@@ -180,8 +183,8 @@ public final class XWT extends JSCallable {
             obStack.setSize(obStack.size() - 1);
             JS parent = (JS)obStack.lastElement();
             int numchildren = ((Integer)parent.get("$numchildren")).intValue();
-            parent.put("$numchildren", new Integer(numchildren + 1), null);
-            parent.put(new Integer(numchildren), me, null);
+            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);
@@ -189,16 +192,15 @@ public final class XWT extends JSCallable {
             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, null);
+                parent.put(new Integer(numchildren - 1), lastChild + s);
             } else {
-                parent.put("$numchildren", new Integer(numchildren + 1), null);
-                parent.put(new Integer(numchildren), s, null);
+                parent.put("$numchildren", new Integer(numchildren + 1));
+                parent.put(new Integer(numchildren), s);
             }
         }
         public void whitespace(char[] ch, int start, int length) {}
-        public JS doParse() throws JS.Exn {
+        public JS doParse(InputStream is) throws JS.Exn {
             try { 
-                InputStream is = getInputStream();
                 BufferedReader r = new BufferedReader(new InputStreamReader(is));
                 parse(r);
             } catch (XML.XMLException e) {