From 6b010667b40641fdb82925e56466f847f721ef1f Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:36:19 +0000 Subject: [PATCH] 2003/09/25 10:56:08 darcs-hash:20040130073619-2ba56-5c948d9c902299a2026c07c910c1c32219c48147.gz --- src/org/xwt/Box.java.pp | 8 ++---- src/org/xwt/HTTP.java | 2 +- src/org/xwt/Main.java | 5 ++-- src/org/xwt/Res.java | 4 ++- src/org/xwt/Template.java | 68 ++++++++++++++++++++++++--------------------- src/org/xwt/XWT.java | 2 +- 6 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index 4a1c07a..f2c45a0 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -1096,8 +1096,8 @@ public final class Box extends JS.Scope { } else { // FIXME } - b.minwidth = Math.min(b.maxwidth, Math.max(b.minwidth, b.image == null ? 0 : b.image.getWidth())); - b.minheight = Math.min(b.maxheight, Math.max(b.minheight, b.image == null ? 0 : b.image.getHeight())); + b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth())); + b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight())); MARK_FOR_REFLOW_b; b.dirty(); } @@ -1140,10 +1140,6 @@ public final class Box extends JS.Scope { }); //#end - specialBoxProperties.put("xwt", new SpecialBoxProperty() { - public Object get(Box b) { return XWT.singleton; } - }); - specialBoxProperties.put("mouseinside", new SpecialBoxProperty() { public Object get(Box b) { return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java index 50c71c9..fed6e6e 100644 --- a/src/org/xwt/HTTP.java +++ b/src/org/xwt/HTTP.java @@ -786,7 +786,7 @@ public class HTTP { public void perform() { Box b = new Box(); Template t = Template.getTemplate((Res)Main.builtin.get("org/xwt/builtin/proxy_authorization.xwt")); - t.apply(b, null, 0, 0, null); + t.apply(b, null, null); b.put("realm", realm); b.put("proxyIP", proxyIP); } diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java index 9febf7c..25fc8e2 100644 --- a/src/org/xwt/Main.java +++ b/src/org/xwt/Main.java @@ -81,8 +81,9 @@ public class Main { // FIXME put the splash screen back in if (Log.on) Log.log(Main.class, "loading xwar"); - Res rr = Res.stringToRes(origin); - Template.getTemplate(((Res)rr.get(initialTemplateName)).addExtension(".xwt")).apply(new Box(), null, 0, 0, rr); + Res rr = Res.stringToRes(origin, true); + XWT xwt = new XWT(rr); + Template.getTemplate(((Res)rr.get(initialTemplateName)).addExtension(".xwt")).apply(new Box(), null, xwt); Message.Q.startQ(); } diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java index bb63940..37cdc29 100644 --- a/src/org/xwt/Res.java +++ b/src/org/xwt/Res.java @@ -15,6 +15,8 @@ public abstract class Res extends JS { /** cache of subresources so that the equality operator works on them */ private Hash refCache = null; + public Template t = null; + public Res getParent() { return null; } /** returns an InputStream containing the Resource's contents */ @@ -50,7 +52,7 @@ public abstract class Res extends JS { if (url.startsWith("https://")) return new HTTP(url); if (url.startsWith("file:") && permitLocalFilesystem) return new File(url.substring(5)); if (url.startsWith("cab:")) return new CAB(stringToRes(url.substring(4))); - throw new JS.Exn("invalid resource specifier"); + throw new JS.Exn("invalid resource specifier " + url); } /** HTTP or HTTPS resource */ diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java index ef6a6f3..209ae25 100644 --- a/src/org/xwt/Template.java +++ b/src/org/xwt/Template.java @@ -34,7 +34,7 @@ public class Template { private JS.CompiledFunction script = null; ///< the script on this node private String fileName = "unknown"; ///< the filename this node came from; used only for debugging - private Vec preapply; ///< templates that should be preapplied (in the order of application) + private Vec preapply = new Vec(); ///< templates that should be preapplied (in the order of application) // Instance Members that are only meaningful on root Template ////////////////////////////////////// @@ -49,13 +49,14 @@ public class Template { private int content_start = 0; ///< line number of the first line of content private int content_lines = 0; ///< number of lines in content private int startLine = -1; ///< the line number that this element starts on - final Res r; ///< the resource we came from + private final Res r; ///< the resource we came from // Static data/methods /////////////////////////////////////////////////////////////////// public static Template getTemplate(Res r) { try { + r = r.addExtension(".xwt"); if (r.t != null) return r.t; r.t = new Template(r); new TemplateHelper().parseit(r.getInputStream(), r.t); @@ -69,8 +70,8 @@ public class Template { public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) { // URL if (str.indexOf("://") != -1) { - if (permitAbsolute) return str; - Log.log("absolute URL " + str + " not permitted here"); + if (permitAbsolute) return Res.stringToRes(str); + Log.log(Template.class, "absolute URL " + str + " not permitted here"); return null; } @@ -88,7 +89,7 @@ public class Template { // Methods to apply templates //////////////////////////////////////////////////////// - private Template() { this.r = r; } + private Template(Res r) { this.r = r; } /** called before this template is applied or its static object can be externally referenced */ JS.Scope getStatic() { @@ -109,17 +110,17 @@ public class Template { getStatic(); - if (id != null) parentPis.putDollar(id, this); + if (id != null) parentPis.putDollar(id, b); for(int i=0; i"); if (c.len != 0) throw new XML.SchemaException("root element must not have attributes"); - state = STATE_IN_XWT_NODE + state = STATE_IN_XWT_NODE; return; case STATE_IN_XWT_NODE: @@ -173,19 +175,29 @@ public class Template { if (c.localName.equals("doc")) { // FIXME: ignore } else if (c.localName.equals("static")) { - if (staticscript != null) + if (t.staticscript != null) throw new XML.SchemaException("the header node may not appear more than once"); if (c.len > 0) throw new XML.SchemaException("the node may not have attributes"); } else if (c.localName.equals("template")) { t.startLine = getLine(); state = STATE_IN_TEMPLATE_NODE; + processBodyElement(c); } else { throw new XML.SchemaException("unrecognized header node \"" + c.localName + "\""); } return; case STATE_IN_TEMPLATE_NODE: + // push the last node we were in onto the stack + nodeStack.addElement(t); + // instantiate a new node, and set its fileName/importlist/preapply + Template t2 = new Template(t.r); + t2.startLine = getLine(); + if (!c.localName.equals("box") && !c.localName.equals("template")) + t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName); + // make the new node the current node + t = t2; processBodyElement(c); return; @@ -195,23 +207,10 @@ public class Template { } private void processBodyElement(XML.Element c) { - // push the last node we were in onto the stack - nodeStack.addElement(t); - - // instantiate a new node, and set its fileName/importlist/preapply - Template t2 = new Template(t.fileName); - t2.startLine = getLine(); - if (!c.localName.equals("box")) - t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName); - // make the new node the current node - t = t2; - - t.keys = new String[c.len]; - t.vals = new Object[c.len]; Hash h = new Hash(c.len * 2, 3); for(int i=0; i0; j--) { t.keys[j] = t.keys[j - 1]; t.vals[j] = t.vals[j - 1]; } t.keys[0] = (String)v.elementAt(i); - t.vals[0] = h.get(t.keys[i]); + t.vals[0] = h.get(t.keys[0]); } else { t.keys[i] = (String)v.elementAt(i); t.vals[i] = h.get(t.keys[i]); @@ -322,7 +326,7 @@ public class Template { t.content.append(ch, start, length); t.content_lines++; - } else if (nameOfHeaderNodeBeingProcessed != null) { + } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) { throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content"); } } @@ -348,15 +352,15 @@ public class Template { public void declare(String s) { super.declare(s); } public Object get(Object key) { if (key.equals("xwt")) return xwt; - if (Box.SpecialBoxProperty.specialBoxProperties.get(key) != null) return parentScope.get(key); + if (Box.SpecialBoxProperty.specialBoxProperties.get(key.toString()) != null) return getParentScope().get(key); if (super.has(key)) return super.get(key); Object ret = xwt.rr.get(key); if (ret != null) return ret; throw new JS.Exn("must declare " + key + " before using it!"); } public void put(Object key, Object val) { - if (Box.SpecialBoxProperty.specialBoxProperties.get(key) == null) parentScope.put(key, val); - else if (super.has(key)) super.put(key, val); + if (Box.SpecialBoxProperty.specialBoxProperties.get(key.toString()) != null) getParentScope().put(key, val); + else if (super.has(key)) super.put(key, val); else throw new JS.Exn("must declare " + key + " before using it!"); } } diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java index 19b2237..d276f05 100644 --- a/src/org/xwt/XWT.java +++ b/src/org/xwt/XWT.java @@ -122,7 +122,7 @@ public final class XWT extends JS.Obj { if (checkOnly) return Boolean.TRUE; if (args.length() != 1) return null; String file = Platform.fileDialog(args.elementAt(0).toString(), false); - return file == null ? null : new Res.stringToResource("file:" + file); + return file == null ? null : Res.stringToRes("file:" + file); } else if (method.equals("saveFile")) { if (checkOnly) return Boolean.TRUE; -- 1.7.10.4