Changeset 1346 for trunk/universe/kauri-template/src/main/java/org/kauriproject/template/DefaultTemplateBuilder.java

Timestamp:

2009-07-02 15:06:52 (3 years ago)

Author:

bruno

Message:

Introduce a TemplateException? class, and use that in the template code instead of a generic RuntimeException?.

File:

• trunk/universe/kauri-template/src/main/java/org/kauriproject/template/DefaultTemplateBuilder.java (modified) (6 diffs)

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/DefaultTemplateBuilder.java

@@ -139 +139 @@
             xmlReader.parse(is);
         } catch (Exception ex) {
-            throw new RuntimeException("Error parsing template file " + source.getReference(), ex);
+            throw new TemplateException("Error parsing template file " + source.getReference(), ex);
         } finally {
             IOUtils.closeQuietly(in);
@@ -160 +160 @@
             parser = factory.newSAXParser();
         } catch (SAXException saxex) {
-            log.error(saxex);
+            throw new TemplateException(saxex);
         } catch (ParserConfigurationException parsex) {
-            log.error(parsex);
+            throw new TemplateException(parsex);
         }
         return parser;
@@ -396 +396 @@
                         blocksPushed++;
                         if (macroRegistry.containsKey(macroblock.getName())) {
-                            throw new RuntimeException("A macro with name " + macroblock.getName()
+                            throw new TemplateException("A macro with name " + macroblock.getName()
                                     + " is already defined, location "
                                     + macroblock.getStartStep().getLocation());
@@ -417 +417 @@
 
                         if (parentBlock == null) {
-                            throw new RuntimeException(
+                            throw new TemplateException(
                                     "Parameter must appear as a direct child in a macro or callMacro element, location "
                                             + parameterblock.getStartStep().getLocation());
@@ -435 +435 @@
                         blocksPushed++;
                         if (inheritanceRegistry.containsKey(inheritblock.getName())) {
-                            throw new RuntimeException("A block with name " + inheritblock.getName()
+                            throw new TemplateException("A block with name " + inheritblock.getName()
                                     + " is already defined, location "
                                     + inheritblock.getStartStep().getLocation());
@@ -445 +445 @@
                                 attributes), parent);
                         if (parent == null) {
-                            throw new RuntimeException(
+                            throw new TemplateException(
                                     "A call to a superBlock is only possible from within an overriding block, location "
                                             + superblock.getStartStep().getLocation());