X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=03dd337e7c10368342fe0f1b2a292c59db0b451b;hb=16ad8b9430571d806f2aeb18ec472a277ff69423;hp=dbd39cc56fd5bfb31c97b92c8b50e833fc0c89f9;hpb=c730780164e644077bb9cb3906a6519824a67de4;p=org.ibex.core.git
diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index dbd39cc..03dd337 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.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.*;
@@ -26,22 +26,19 @@ public class Template {
// Instance Members ///////////////////////////////////////////////////////
- String id = null; ///< the id of this box
- String redirect = null; ///< the id of the redirect target; only meaningful on a root node
- private String[] keys; ///< keys to be "put" to instances of this template; elements correspond to those of vals
- private Object[] vals; ///< values to be "put" to instances of this template; elements correspond to those of keys
- private Vec children = new Vec(); ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
- private int numunits = -1; ///< see numUnits(); -1 means that this value has not yet been computed
-
- private JSFunction script = null; ///< the script on this node
- private String fileName = "unknown"; ///< the filename this node came from; used only for debugging
- private Vec preapply = new Vec(); ///< templates that should be preapplied (in the order of application)
+ String id = null; ///< the id of this box
+ String redirect = null; ///< the id of the redirect target; only meaningful on a root node
+ private String[] keys; ///< keys to be "put" to instances of this template; elements correspond to those of vals
+ private Object[] vals; ///< values to be "put" to instances of this template; elements correspond to those of keys
+ private Vec children = new Vec(); ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
+ private JS script = null; ///< the script on this node
+ private String tagname = null; ///< template to preapply (if any)
// Instance Members that are only meaningful on root Template //////////////////////////////////////
- private JSScope staticJSScope = null; ///< the scope in which the static block is executed
- private JSFunction staticscript = null; ///< the script on the static node of this template, null already performed
+ private JSScope staticScope = null; ///< the scope in which the static block is executed
+ private JS staticscript = null; ///< the script on the static node of this template, null already performed
// Only used during parsing /////////////////////////////////////////////////////////////////
@@ -49,113 +46,91 @@ public class Template {
private StringBuffer content = null; ///< during XML parsing, this holds partially-read character data; null otherwise
private int content_start = 0; ///< line number of the first line of content
private int startLine = -1; ///< the line number that this element starts on
- private final Res r; ///< the resource we came from
+ private XWT xwt;
// Static data/methods ///////////////////////////////////////////////////////////////////
- public static Template getTemplate(Res r) throws JSExn {
- try {
- r = r.addExtension(".xwt");
- if (r.t != null) return r.t;
- r.t = new Template(r);
- new TemplateHelper().parseit(r.getInputStream(), r.t);
- return r.t;
- } catch (Exception e) { throw new JSExn(e.toString());
- }
- }
-
- public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
- // URL
- if (str.indexOf("://") != -1) {
- if (permitAbsolute) return (Res)xwt.url2res(str);
- throw new JSExn("absolute URL " + str + " not permitted here");
- }
-
- // root-relative
- Res ret = xwt.rr;
- while(str.indexOf('.') != -1) {
- String path = str.substring(0, str.indexOf('.'));
- str = str.substring(str.indexOf('.') + 1);
- ret = (Res)ret.get(path);
- }
- ret = (Res)ret.get(str);
- return ret;
+ // for non-root nodes
+ private Template(XWT xwt) { this.xwt = xwt; }
+ public Template(InputStream is, XWT xwt) throws IOException, JSExn, XML.Exn {
+ this.xwt = xwt; new TemplateHelper().parseit(is, this);
}
-
+
// Methods to apply templates ////////////////////////////////////////////////////////
- private Template(Res r) {
- this.r = r;
- String f = r.toString();
- if (f != null && !f.equals(""))
- fileName = f.substring(f.lastIndexOf('/')+1, f.endsWith(".xwt") ? f.length() - 4 : f.length());
- }
-
/** called before this template is applied or its static object can be externally referenced */
JSScope getStatic() throws JSExn {
- if (staticJSScope == null) staticJSScope = new JSScope(null);
- if (staticscript == null) return staticJSScope;
- JSFunction temp = staticscript;
+ if (staticScope == null) staticScope = new PerInstantiationScope(null, xwt, null, null);
+ if (staticscript == null) return staticScope;
+ JS temp = staticscript;
staticscript = null;
- temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
- return staticJSScope;
+ JS.cloneWithNewParentScope(temp, staticScope).call(null, null, null, null, 0);
+ return staticScope;
}
/** Applies the template to Box b
* @param pboxes a vector of all box parents on which to put $-references
* @param ptemplates a vector of the fileNames to recieve private references on the pboxes
*/
- void apply(Box b, XWT xwt) {
+ void apply(Box b) throws JSExn {
try {
- apply(b, xwt, null);
+ apply(b, null);
+ } catch (IOException e) {
+ b.clear(b.VISIBLE);
+ b.mark_for_repack();
+ Log.warn(this, e);
+ throw new JSExn(e.toString());
} catch (JSExn e) {
b.clear(b.VISIBLE);
b.mark_for_repack();
- Log.log(Template.class, "WARNING: exception (below) thrown during application of template;");
- Log.log(Template.class, " setting visibility of target box to \"false\"");
- Log.logJS(e);
+ Log.warn(this, e);
+ throw e;
}
}
-
- private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-
+ private void apply(Box b, PerInstantiationScope parentPis) throws JSExn, IOException {
getStatic();
+ // FIXME this dollar stuff is all wrong
if (id != null) parentPis.putDollar(id, b);
- for(int i=0; i= 0) {
- b.putAndTriggerTraps("fill", resolveStringToResource((String)vals[i], xwt, true));
- }
- else if ("redirect".equals(keys[i])) {
- if (vals[i] == null || "null".equals(vals[i])) b.putAndTriggerTraps("redirect", null);
- Object rbox = pis.get("$"+vals[i]);
- if (rbox == null) Log.log(this, "redirect target '"+vals[i]+"' not found");
- else b.putAndTriggerTraps("redirect", rbox);
+ if (script != null) JS.cloneWithNewParentScope(script, pis).call(null, null, null, null, 0);
+
+ Object key, val;
+ for(int i=0; keys != null && i < keys.length; i++) {
+ if (keys[i] == null) continue;
+ key = keys[i];
+ val = vals[i];
+
+ if ("null".equals(val)) val = null;
+
+ if (val != null && val instanceof String && ((String)val).length() > 0) {
+ switch (((String)val).charAt(0)) {
+ case '$':
+ val = pis.get(val);
+ if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute");
+ break;
+ case '.':
+ val = xwt.resolveStringToResource(((String)val).substring(1), false);
+ // FIXME: url case
+ // FIXME: should we be resolving all of these in the XML-parsing code?
+ }
}
- else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
+
+ b.putAndTriggerTraps(key, val);
+ }
}
@@ -223,10 +198,10 @@ public class Template {
// 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);
+ Template t2 = new Template(t.xwt);
t2.startLine = getLine();
if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template"))
- t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
+ t2.tagname = ((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
// make the new node the current node
t = t2;
processBodyElement(c);
@@ -244,34 +219,15 @@ public class Template {
// process attributes into Vecs, dealing with any XML Namespaces in the process
ATTR: for (int i=0; i < c.getAttrLen(); i++) {
//#switch(c.getAttrKey(i))
- case "font":
- keys.addElement(c.getAttrKey(i));
- if (c.getAttrUri(i) != null) vals.addElement(c.getAttrUri(i) + "." + c.getAttrVal(i));
- else vals.addElement(c.getAttrVal(i));
- continue ATTR;
-
- case "fill":
- keys.addElement(c.getAttrKey(i));
- if (c.getAttrUri(i) != null && !c.getAttrVal(i).startsWith("#") && SVG.colors.get(c.getAttrVal(i)) == null)
- vals.addElement(c.getAttrUri(i) + "." + c.getAttrVal(i));
- else vals.addElement(c.getAttrVal(i));
- continue ATTR;
-
- // process and do not add to box attributes
-
- case "preapply":
- String uri = c.getAttrUri(i); if (!uri.equals("")) uri += ".";
- StringTokenizer tok = new StringTokenizer(c.getAttrVal(i).toString(), " ");
- while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
- continue ATTR;
-
case "id":
t.id = c.getAttrVal(i).toString().intern();
continue ATTR;
//#end
+ // treat value starting with '.' as resource reference
+ String uri = c.getAttrUri(i); if (!uri.equals("")) uri = '.' + uri;
keys.addElement(c.getAttrKey(i));
- vals.addElement(c.getAttrVal(i));
+ vals.addElement((c.getAttrVal(i).startsWith(".") ? uri : "") + c.getAttrVal(i));
}
if (keys.size() == 0) return;
@@ -281,8 +237,6 @@ public class Template {
return ((String)a).compareTo((String)b);
} });
-
- // merge attributes into template
t.keys = new String[keys.size()];
t.vals = new Object[vals.size()];
keys.copyInto(t.keys);
@@ -314,13 +268,11 @@ public class Template {
}
}
- private JSFunction parseScript(boolean isstatic) throws IOException {
- JSFunction thisscript = null;
+ private JS parseScript(boolean isstatic) throws IOException {
+ JS thisscript = null;
String contentString = t.content.toString();
if (contentString.trim().length() > 0)
- thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
- t.content_start,
- new StringReader(contentString));
+ thisscript = JS.fromReader("FIXME", t.content_start, new StringReader(contentString));
t.content = null;
t.content_start = 0;
return thisscript;
@@ -353,7 +305,7 @@ public class Template {
public void characters(char[] ch, int start, int length) throws XML.Exn {
// invoke the no-tab crusade
for (int i=0; length >i; i++) if (ch[start+i] == '\t')
- throw new XML.Exn("tabs are not allowed in XWT files", XML.Exn.SCHEMA, getLine(), getCol());
+ Log.error(Template.class, "tabs are not allowed in XWT files ("+getLine()+":"+getCol()+")");
if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
if (t.content == null) {
@@ -371,16 +323,16 @@ public class Template {
public void whitespace(char[] ch, int start, int length) throws XML.Exn { }
}
- private static class PerInstantiationJSScope extends JSScope {
+ private static class PerInstantiationScope extends JSScope {
XWT xwt = null;
- PerInstantiationJSScope parentBoxPis = null;
+ PerInstantiationScope parentBoxPis = null;
JSScope myStatic = null;
void putDollar(String key, Box target) throws JSExn {
if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
declare("$" + key);
put("$" + key, target);
}
- public PerInstantiationJSScope(JSScope parentScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
+ public PerInstantiationScope(JSScope parentScope, XWT xwt, PerInstantiationScope parentBoxPis, JSScope myStatic) {
super(parentScope);
this.parentBoxPis = parentBoxPis;
this.xwt = xwt;
@@ -389,7 +341,7 @@ public class Template {
public Object get(Object key) throws JSExn {
if (super.has(key)) return super.get(key);
if (key.equals("xwt")) return xwt;
- if (key.equals("")) return xwt.rr;
+ if (key.equals("")) return xwt.get("");
if (key.equals("static")) return myStatic;
return super.get(key);
}