X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=69af74a416de57ac4d79acef1b9d22f731106e53;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=c9ac13845457c3d5d20d83d361b79be29d5aa629;hpb=c04f9567b37c8475120c5b3b8ccc841bae31ae7c;p=org.ibex.core.git
diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index c9ac138..69af74a 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.*;
@@ -40,7 +40,7 @@ public class Template {
// Instance Members that are only meaningful on root Template //////////////////////////////////////
- private JSScope staticJSScope = null; ///< the scope in which the static block is executed
+ private JSScope staticScope = 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
@@ -49,44 +49,46 @@ 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 final Stream r; ///< the resource we came from
// Static data/methods ///////////////////////////////////////////////////////////////////
- public static Template getTemplate(Res r) throws JSExn {
+ // FIXME need to provide the XWT object too
+ public static Template getTemplate(Stream 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());
+ } catch (Exception e) {
+ throw new JSExn("Error reading template stream: " + r + "\n" + e.toString());
}
}
- public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
+ public static Stream resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
// URL
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;
+ Stream 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 = (Stream)ret.get(path);
}
- ret = (Res)ret.get(str);
+ ret = (Stream)ret.get(str);
return ret;
}
// Methods to apply templates ////////////////////////////////////////////////////////
- private Template(Res r) {
+ private Template(Stream r) {
this.r = r;
String f = r.toString();
if (f != null && !f.equals(""))
@@ -94,34 +96,32 @@ public class Template {
}
/** 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;
+ JSScope getStatic(XWT xwt) throws JSExn {
+ if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
+ if (staticscript == null) return staticScope;
JSFunction temp = staticscript;
staticscript = null;
- temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
- return staticJSScope;
+ temp.cloneWithNewParentScope(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, XWT xwt) throws JSExn {
try {
apply(b, xwt, null);
} 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 {
- getStatic();
+ getStatic(xwt);
if (id != null) parentPis.putDollar(id, b);
for(int i=0; ii; 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) {