X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=3626eecee5c3e90fb6baa9af71bebe42c63ba8b4;hb=163ff4c57ec557bb8615f80e875f045cdfbad696;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..3626eec 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.*;
@@ -33,15 +33,15 @@ public class Template {
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 JS 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)
// 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 +49,125 @@ 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 {
+ public Template(InputStream is, XWT xwt) {
+ this.xwt = xwt;
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());
+ new TemplateHelper().parseit(is, this);
+ } catch (Exception e) {
+ throw new RuntimeException(e.toString());
}
}
- public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
+ public Template(XWT xwt) {
+ this.xwt = xwt;
+ }
+
+ public static JS resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
// URL
+ /* FIXME
if (str.indexOf("://") != -1) {
- if (permitAbsolute) return (Res)xwt.url2res(str);
+ if (permitAbsolute) return (Stream)xwt.url2res(str);
throw new JSExn("absolute URL " + str + " not permitted here");
}
-
+ */
// root-relative
- Res ret = xwt.rr;
+ JS ret = (JS)xwt.getAndTriggerTraps("");
while(str.indexOf('.') != -1) {
String path = str.substring(0, str.indexOf('.'));
str = str.substring(str.indexOf('.') + 1);
- ret = (Res)ret.get(path);
+ ret = (JS)ret.get(path);
}
- ret = (Res)ret.get(str);
+ ret = (JS)ret.get(str);
return ret;
}
// 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 PerInstantiationJSScope(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();
+ 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);
+ throw e;
}
}
-
- private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-
+ private void apply(Box b, PerInstantiationJSScope parentPis) throws JSExn, IOException {
getStatic();
if (id != null) parentPis.putDollar(id, b);
for(int i=0; i 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 = resolveStringToResource(((String)val).substring(1), xwt, true);
+ }
}
- else if ("fill".equals(keys[i]) && ((String)vals[i]).indexOf('.') >= 0) {
- b.putAndTriggerTraps("fill", resolveStringToResource((String)vals[i], xwt, true));
+
+ if (val != null && "redirect".equals(key)) {
+ val = pis.get("$"+val);
+ if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
}
- 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);
+
+ try {
+ b.putAndTriggerTraps(key, val);
+ } catch(JSExn e) {
+ e.addBacktrace(fileName + ":attr-" + key,0);
+ throw e;
}
- else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
+ }
}
@@ -223,7 +235,7 @@ 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());
@@ -244,21 +256,6 @@ 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(), " ");
@@ -270,8 +267,10 @@ public class Template {
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 +280,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,11 +311,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 ? "._" : ""),
+ thisscript = JS.fromReader(t.fileName + (isstatic ? "._" : ""),
t.content_start,
new StringReader(contentString));
t.content = null;
@@ -353,7 +350,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) {
@@ -389,7 +386,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);
}