2003/12/16 00:04:21

[org.ibex.core.git] / src / org / xwt / Template.java

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 4cbf5e4..b11cf7c 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -53,30 +53,22 @@ public class Template {
 
     // 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);
-            try { new TemplateHelper().parseit(r.getInputStream(), r.t); }
-            catch (FileNotFoundException e) { Log.log(Template.class, "template not found: "+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) {
-            try {
-                if (permitAbsolute) return (Res)xwt.callMethod("res.url", str, null, null, null, 1);
-            } catch (JSExn jse) {
-                throw new Error("this should never happen");
-            }
-            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
@@ -101,16 +93,12 @@ public class Template {
     }
 
     /** 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;
         staticscript = null;
-        try {
-            temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
-        } catch (JSExn jse) {
-            throw new Error("this should never happen");
-        }
+        temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
         return staticJSScope;
     }
     
@@ -142,7 +130,7 @@ public class Template {
         for(int i=0; keys != null && i<keys.length; i++)
             if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') {
                 Object rbox = pis.get(vals[i]);
-                if (rbox == null) Log.log(this, "unknown box id '"+vals[i]+"' referenced");
+                if (rbox == null) Log.log(this, "unknown box id '"+vals[i]+"' referenced in XML attribute");
                 else b.putAndTriggerTraps(keys[i], rbox);
             }
             else if ("image".equals(keys[i])) b.putAndTriggerTraps("image", resolveStringToResource((String)vals[i], xwt, true));
@@ -299,24 +287,19 @@ public class Template {
             }
         }
 
-        private JSFunction parseScript(boolean isstatic) {
+        private JSFunction parseScript(boolean isstatic) throws IOException {
             JSFunction thisscript = null;
-            try {
-                String contentString = t.content.toString();
-                if (contentString.trim().length() > 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;
             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;
@@ -379,6 +362,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("static")) return myStatic;
             return super.get(key);
         }