r = r.addExtension(".xwt");
if (r.t != null) return r.t;
r.t = new Template(r);
- new TemplateHelper().parseit(r.getInputStream(), r.t);
+ try { new TemplateHelper().parseit(r.getInputStream(), r.t); }
+ catch (FileNotFoundException e) { Log.log(Template.class, "template not found: "+r); }
return r.t;
} catch (Exception e) {
if (Log.on) Log.log(r.t == null ? "null" : r.t.fileName, e);
private void processBodyElement(XML.Element c) {
Hash h = new Hash(c.len * 2, 3);
+
+ // WARNING: c.keys.length != c.len; USE c.len
for(int i=0; i<c.len; i++) {
- if (c.keys[i] == null) continue;
- if (c.keys[i].equals("font")) c.vals[i] = c.uris[i] + "." + c.vals[i];
+ if (c.keys[i] == null) throw new RuntimeException("XML parser returned a null key position="+i);
+ if (c.keys[i].equals("font") && c.uris[i] != null) c.vals[i] = c.uris[i] + "." + c.vals[i];
if (c.keys[i].equals("preapply")) {
- String uri = c.uris[i];
+ // process preapply and 'remove' from array
+ String uri = c.uris[i] == null ? "" : c.uris[i] + '.';
StringTokenizer tok = new StringTokenizer(c.vals[i].toString(), " ");
while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
- c.keys[i] = c.keys[c.keys.length - 1];
- c.vals[i] = c.vals[c.vals.length - 1];
- i--;
+
+ if (i < c.len - 1) { // not the last attribute
+ c.keys[i] = c.keys[c.len - 1];
+ c.vals[i] = c.vals[c.len - 1];
+ c.uris[i] = c.uris[c.len - 1];
+ }
+ c.len--; i--;
continue;
}
h.put(c.keys[i], c.vals[i]);