X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=1d3965507ca5745c7dbdc348fa50899245e288bf;hb=66088da8711e9855d6328732bbcce8788301a8bc;hp=62bcc1d91c033bf8abc25aec17dfd5f0bb9b7266;hpb=8fbfbafc7d95060fe63c57872131dc35f92dfdb2;p=org.ibex.core.git
diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 62bcc1d..1d39655 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -47,33 +47,28 @@ 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 content_lines = 0; ///< number of lines in content
private int startLine = -1; ///< the line number that this element starts on
private final Res r; ///< the resource we came from
// Static data/methods ///////////////////////////////////////////////////////////////////
- public static Template getTemplate(Res r) {
+ 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) {
- if (Log.on) Log.log(r.t == null ? "null" : r.t.fileName, e);
- return null;
+ } catch (Exception e) { throw new JSExn(e.toString());
}
}
- public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) {
+ public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
// URL
if (str.indexOf("://") != -1) {
- // FIXME
- //if (permitAbsolute) return Res.fromString(str);
- Log.log(Template.class, "absolute URL " + str + " not permitted here");
- return null;
+ if (permitAbsolute) return (Res)xwt.url2res(str);
+ throw new JSExn("absolute URL " + str + " not permitted here");
}
// root-relative
@@ -90,10 +85,15 @@ public class Template {
// Methods to apply templates ////////////////////////////////////////////////////////
- private Template(Res r) { this.r = r; }
+ 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() {
+ JSScope getStatic() throws JSExn {
if (staticJSScope == null) staticJSScope = new JSScope(null);
if (staticscript == null) return staticJSScope;
JSFunction temp = staticscript;
@@ -106,8 +106,20 @@ public class Template {
* @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) { apply(b, xwt, null); }
- void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) {
+ void apply(Box b, XWT xwt) {
+ 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);
+ }
+ }
+
+
+ private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
getStatic();
@@ -122,14 +134,24 @@ public class Template {
for (int i=0; children != null && i 0)
- thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
- t.content_start,
- new StringReader(contentString));
- } catch (IOException ioe) {
- if (Log.on) Log.log(this, " ERROR: " + ioe.getMessage());
- thisscript = null;
- }
+ String contentString = t.content.toString();
+ if (contentString.trim().length() > 0)
+ thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
+ t.content_start,
+ new StringReader(contentString));
t.content = null;
t.content_start = 0;
- t.content_lines = 0;
return thisscript;
}
- public void endElement(XML.Element c) throws XML.SchemaException {
+ public void endElement(XML.Element c) throws XML.SchemaException, IOException {
if (state == STATE_IN_XWT_NODE) {
if ("static".equals(nameOfHeaderNodeBeingProcessed) && t.content != null) t.staticscript = parseScript(true);
nameOfHeaderNodeBeingProcessed = null;
@@ -305,6 +328,9 @@ public class Template {
t = (Template)nodeStack.lastElement();
nodeStack.setSize(nodeStack.size() - 1);
t.children.addElement(oldt);
+
+ int oldt_lines = getLine() - oldt.startLine;
+ for (int i=0; oldt_lines > i; i++) t.content.append('\n');
}
}
}
@@ -317,12 +343,10 @@ public class Template {
if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
if (t.content == null) {
t.content_start = getLine();
- t.content_lines = 0;
t.content = new StringBuffer();
}
t.content.append(ch, start, length);
- t.content_lines++;
} else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");
@@ -336,7 +360,7 @@ public class Template {
XWT xwt = null;
PerInstantiationJSScope parentBoxPis = null;
JSScope myStatic = null;
- void putDollar(String key, Box target) {
+ void putDollar(String key, Box target) throws JSExn {
if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
declare("$" + key);
put("$" + key, target);
@@ -347,13 +371,14 @@ public class Template {
this.xwt = xwt;
this.myStatic = myStatic;
}
- public Object get(Object key) {
+ 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("static")) return myStatic;
return super.get(key);
}
- public void put(Object key, Object val) {
+ public void put(Object key, Object val) throws JSExn {
if (super.has(key)) super.put(key, val);
else super.put(key, val);
}