Changeset 683

Timestamp:

2008-10-08 10:53:38 (5 years ago)

Author:

jgou

Message:

KTL: first implementation of new feature: import

Location:

trunk/universe/kauri-template/src

Files:

• main/java/org/kauriproject/template/DefaultTemplateBuilder.java (modified) (1 diff)
• main/java/org/kauriproject/template/Directive.java (modified) (2 diffs)
• main/java/org/kauriproject/template/DocumentBlock.java (modified) (1 diff)
• main/java/org/kauriproject/template/IfBlock.java (modified) (1 diff)
• main/java/org/kauriproject/template/ImportBlock.java (added)
• test/java/org/kauriproject/template/TemplateExecutionTest.java (modified) (2 diffs)
• test/resources/org/kauriproject/template/import.xml (added)
• test/resources/org/kauriproject/template/import_result.xml (added)

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

@@ -278 +278 @@
                             localName, name, attributes), templateService);
                     pushBlock(includeblock);
+                } else if (Directive.IMPORT == directive) {
+                    ImportBlock importblock = new ImportBlock(elFacade, locator, new SaxElement(uri,
+                            localName, name, attributes), templateService);
+                    pushBlock(importblock);
                 } else if (Directive.VARIABLE == directive) {
                     VariableBlock varblock = new VariableBlock(elFacade, locator, new SaxElement(uri,

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

@@ -67 +67 @@
     INCLUDE("include"),
     /**
+     * directive to import another template<br>
+     * import src="template-location"
+     */
+    IMPORT("import"),
+    /**
      * directive to create a variable<br>
      * variable name="foo" [value="bar"]
@@ -120 +125 @@
         else if (name.equals(INCLUDE.tagName))
             return INCLUDE;
+        else if (name.equals(IMPORT.tagName))
+            return IMPORT;
         else if (name.equals(VARIABLE.tagName))
             return VARIABLE;

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

@@ -78 +78 @@
             if (inc != null) {
                 // import or include
-                Step next = inc.getEndStep().getCompiledNext();
+                Step next = inc.getEndStep();
                 // remove mapping because of recursion detection
                 includeRegistry.remove(key);

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

@@ -75 +75 @@
         public Step executeAndProceed(ExecutionContext context, TemplateResult result) {
 
-            // final boolean test = (Boolean) elFacade.evaluateExpression(elExpression, context);
             final boolean test = (Boolean) elExpression.evaluate(context.getTemplateContext());
 

trunk/universe/kauri-template/src/test/java/org/kauriproject/template/TemplateExecutionTest.java

@@ -102 +102 @@
         testFlow("/org/kauriproject/template/comment.xml", true);
     }
-    
+
     public void testMacro() throws Exception {
         testFlow("/org/kauriproject/template/macro.xml", true);
     }
-    
+
     public void testInclude() throws Exception {
         testFlow("/org/kauriproject/template/include.xml", true);
+    }
+
+    public void testImport() throws Exception {
+        testFlow("/org/kauriproject/template/import.xml", true);
     }
 
@@ -121 +125 @@
         testFlow("/org/kauriproject/template/dropprefix3.xml", true);
 
-        //test drop mapping which is still used in the document
+        // test drop mapping which is still used in the document
         testFlow("/org/kauriproject/template/dropprefix4.xml", true);
 
-        //test drop mapping which is still used in the document, attrs with same local name
+        // test drop mapping which is still used in the document, attrs with same local name
         testFlow("/org/kauriproject/template/dropprefix4a.xml", true);