X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=2e4999a38e499d4e97f159ec288a398b79e43a02;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=25a05a314af093db566c5f2bd1be6c4d40924027;hpb=ef61babe77a94eba181c95a52c0069a612276dff;p=org.ibex.core.git diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java index 25a05a3..2e4999a 100644 --- a/src/org/xwt/XWT.java +++ b/src/org/xwt/XWT.java @@ -1,4 +1,4 @@ -// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import java.io.*; @@ -13,8 +13,8 @@ import org.bouncycastle.util.encoders.Base64; /** Singleton class that provides all functionality in the xwt.* namespace */ public final class XWT extends JS { - public final Res rr; - public XWT(Res rr) { this.rr = rr; } + public final Stream rr; + public XWT(Stream rr) { this.rr = rr; } private Cache subCache = new Cache(20); private Sub getSub(String s) { @@ -54,10 +54,10 @@ public final class XWT extends JS { case "graft": return METHOD; case "clone": return METHOD; case "regexp": return METHOD; - case "font": return getSub("font"); - case "font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf"); - case "font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf"); - case "font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf"); + case "ui.font": return getSub("ui.font"); + case "ui.font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf"); + case "ui.font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf"); + case "ui.font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf"); case "ui": return getSub("ui"); case "ui.browser": return METHOD; case "ui.mouse": return getSub("ui.mouse"); @@ -92,9 +92,10 @@ public final class XWT extends JS { case "stream.parse.html": return METHOD; case "stream.parse.xml": return METHOD; case "stream.parse.utf8": return METHOD; - case "rpc": return getSub("rpc"); - case "rpc.xml": return METHOD; - case "rpc.soap": return METHOD; + case "net": return getSub("net"); + case "net.rpc": return getSub("net.rpc"); + case "net.rpc.xml": return METHOD; + case "net.rpc.soap": return METHOD; case "log": return getSub("log"); case "log.debug": return METHOD; case "log.info": return METHOD; @@ -113,7 +114,11 @@ public final class XWT extends JS { //#switch(name) case "thread": Scheduler.add((JSFunction)value); return; case "ui.clipboard": Platform.setClipBoard((String)value); return; - case "ui.frame": Platform.createSurface((Box)value, true, true); return; + case "ui.frame": + Box b = (Box)value; + Surface s = Platform.createSurface(b,true, true); + if(b.get("titlebar") != null) s.setTitleBarText(JS.toString(b.get("titlebar"))); + return; case "ui.window": Platform.createSurface((Box)value, false, true); return; case "undocumented.internal.proxyAuthorization": HTTP.Proxy.Authorization.authorization = value.toString(); @@ -132,7 +137,7 @@ public final class XWT extends JS { if (a instanceof Box) throw new JSExn("can't graft onto Boxes"); if (a instanceof String) throw new JSExn("can't graft onto Strings"); if (a instanceof Number) throw new JSExn("can't graft onto Numbers"); - if (a instanceof Res) return new Res.Graft((Res)a, b, c); + if (a instanceof Stream) return new Stream.Graft((Stream)a, b, c); // FEATURE: grafting onto JS throw new JSExn("cannot graft onto "+a.getClass()); //#end @@ -146,17 +151,17 @@ public final class XWT extends JS { case 1: //#switch(name) case "ui.browser": Platform.newBrowserWindow((String)a); return null; - case "clone": return new XWT((Res)a); - case "stream.unzip": return new Res.Zip((Res)a); - case "stream.uncab": return new Res.Cab((Res)a); - case "stream.cache": try { return new Res.CachedRes((Res)a, "resources", true); } - catch (Res.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); } + case "clone": return new XWT((Stream)a); + case "stream.unzip": return new Stream.Zip((Stream)a); + case "stream.uncab": return new Stream.Cab((Stream)a); + case "stream.cache": try { return new Stream.CachedStream((Stream)a, "resources", true); } + catch (Stream.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); } case "stream.url": return url2res((String)a); case "thread.sleep": sleep(JS.toInt(a)); return null; - case "log.debug": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; - case "log.info": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; - case "log.warn": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; - case "log.error": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; + case "log.debug": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.info": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.warn": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.error": JS.log(this, a== null ? "**null**" : a.toString()); return null; case "regexp": return new JSRegexp(a, null); case "rpc.xml": return new XMLRPC((String)a, ""); case "crypto.rsa": /* FEATURE */ return null; @@ -170,9 +175,9 @@ public final class XWT extends JS { break; case 2: //#switch(name) - case "stream.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b); + case "stream.watch": return new Stream.ProgressWatcher((Stream)a, (JSFunction)b); case "apply": - if (b instanceof Res) Template.getTemplate((Res)b).apply((Box)a, XWT.this); + if (b instanceof Stream) Template.getTemplate((Stream)b).apply((Box)a, XWT.this); else { JS to = (JS)a, from = (JS)b; Object k; for (Enumeration e = from.keys(); e.hasMoreElements();) { @@ -180,23 +185,24 @@ public final class XWT extends JS { } } return a; + case "regexp": return new JSRegexp(a, b); //#end break; } } catch (RuntimeException e) { // FIXME: maybe JSExn should take a second argument, Exception - Log.info(this, "xwt."+name+"() threw: "+e); + Log.info(this, "xwt."+name+"() threw: " + e); throw new JSExn("invalid argument for xwt object method "+name+"()"); } throw new JSExn("invalid number of arguments for xwt object method "+name+"()"); } - public Res url2res(String url) throws JSExn { - 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); + public Stream url2res(String url) throws JSExn { + if (url.startsWith("http://")) return new Stream.HTTP(url); + else if (url.startsWith("https://")) return new Stream.HTTP(url); + else if (url.startsWith("data:")) return new Stream.ByteArray(Base64.decode(url.substring(5)), null); + else if (url.startsWith("utf8:")) return new Stream.ByteArray(url.substring(5).getBytes(), null); else throw new JSExn("invalid resource specifier " + url); // FIXME support file:// via dialog boxes }