Changeset 834

Timestamp:

2008-11-26 13:13:36 (4 years ago)

Author:

bruno

Message:

Template engine: I found that the code for the OutputBlock?, which is one of the most basic template blocks, was getting a bit big with all the template inheritance things in it. Therefore, splitted that of in another class, InheritBlock?. Before, it was a bit like two different blocks were implemented in one class.

Location:

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

Files:

• DefaultTemplateBuilder.java (modified) (3 diffs)
• InheritBlock.java (added)
• OutputBlock.java (modified) (6 diffs)
• TemplateExecutor.java (modified) (1 diff)

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

@@ -283 +283 @@
             }
 
+            int blocksPushed = 1;
             if (silencedLevel > 0) {
                 silencedLevel++;
+                blocksPushed = 0;
+            } else if (root && attributes.getValue(TemplateBuilder.NAMESPACE_KTL, InheritBlock.INHERIT) != null) {
+                InheritBlock inherit = new InheritBlock(elFacade, locator, new SaxElement(uri,
+                                localName, name, attributes), templateService);
+                pushBlock(inherit);
             } else {
                 // KTL directives
-                int blocksPushed = 1;
                 if (uri != null && uri.equals(NAMESPACE_KTL)) {
                     Directive directive = Directive.fromString(localName);
@@ -402 +407 @@
                         // TODO: maybe we should provide an errorblock in this case ?
                         OutputBlock outblock = new OutputBlock(elFacade, locator, new SaxElement("",
-                                localName, localName, attributes), templateService, root);
+                                localName, localName, attributes), root);
                         pushBlock(outblock);
                     }
@@ -410 +415 @@
                 } else if (outputAllowed()) { // "ordinary" start elements
                     OutputBlock outblock = new OutputBlock(elFacade, locator, new SaxElement(uri, localName,
-                        name, attributes), templateService, root);
+                        name, attributes), root);
                     pushBlock(outblock);
                 } else {
                     silencedLevel++;
                 }
-                if (silencedLevel == 0)
-                    pushCountStack.push(blocksPushed);
-            }
-
+            }
+            if (silencedLevel == 0)
+                pushCountStack.push(blocksPushed);
         }
 

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

@@ -17 +17 @@
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import org.kauriproject.template.el.ELFacade;
@@ -38 +36 @@
 
     protected ELFacade elFacade;
-    protected TemplateService templateService;
     protected boolean root;
 
-    public OutputBlock(ELFacade elFacade, Locator locator, SaxElement saxElement,
-            TemplateService templateService, boolean root) {
+    public OutputBlock(ELFacade elFacade, Locator locator, SaxElement saxElement, boolean root) {
         super(locator, saxElement);
         this.elFacade = elFacade;
         this.attributes = saxElement.getAttributes();
         this.startStep = new StartStep(this, locator);
-        this.templateService = templateService;
         this.root = root;
     }
@@ -82 +77 @@
         public Step executeAndProceed(ExecutionContext context, TemplateResult result) throws SAXException {
             AttributesImpl atts = new AttributesImpl(attributes);
+            if (context.isSilencing()) {
+                return getEndStep().getCompiledNext();
+            }
+
             Expression elExpression;
             for (int i = 0; i < attributes.getLength(); i++) {
@@ -88 +87 @@
             }
 
-            if (root) {
-                // check inheritance
-                String sourceLocation = atts.getValue(TemplateBuilder.NAMESPACE_KTL, INHERIT);
-                // TODO: check all attributes in ktl namespace, log warning if not supported
-                if (sourceLocation != null) {
-                    sourceLocation = context.getSourceResolver().toAbsolutePath(sourceLocation, context.getBaseUri());
-                    // inheritance => lookup base
-                    CompiledTemplate baseTemplate;
-                    try {
-                        // ask service to get compiled template for sourcelocation
-                        // this may trigger a build of the base template
-                        baseTemplate = templateService.buildTemplate(sourceLocation, context);
-                    } catch (Exception ex) {
-                        throw new RuntimeException("Error generating base template, location "
-                                + getLocation() + " : " + ex);
-                    }
-
-                    // merge inheritance mappings
-                    Map<String, List<InheritanceBlock>> inheritanceChain = context.getInheritanceChain();
-                    Map<String, InheritanceBlock> baseRegistry = baseTemplate.getInheritanceRegistry();
-                    for (String block : baseRegistry.keySet()) {
-                        if (!inheritanceChain.containsKey(block)) {
-                            List<InheritanceBlock> chain = new LinkedList<InheritanceBlock>();
-                            chain.add(baseRegistry.get(block));
-                            inheritanceChain.put(block, chain);
-                        } else {
-                            inheritanceChain.get(block).add(baseRegistry.get(block));
-                        }
-                    }
-
-                    context.inheritInc();
-                    context.getExecutor().execute(baseTemplate, null, context, result);
-                    context.inheritDecr();
-                    
-                    return getEndStep().getCompiledNext();
-                }
-            }
-
-            if(context.isSilencing()) {
-                return getEndStep().getCompiledNext();
-            }
-            
             SaxElement el = getSaxElement();
             result.startElement(el.getUri(), el.getLocalName(), el.getName(), atts);
@@ -136 +93 @@
                 // execute the extend blocks before proceding to next
                 for (ExtendBlock extendBlock : context.getExtendList()) {
-                    executeBlock(extendBlock, context, result);
+                    context.getExecutor().execute(extendBlock.getStartStep(), extendBlock.getEndStep().getCompiledNext(), context, result);
                 }
             }
@@ -142 +99 @@
             return super.executeAndProceed(context, result);
         }
-
-        private void executeBlock(TemplateBlock block, ExecutionContext context, TemplateResult result)
-                throws SAXException {
-            Step step = block.getStartStep();
-            Step end = block.getEndStep();
-            while (step != end) {
-                step = step.executeAndProceed(context, result);
-            }
-            end.executeAndProceed(context, result);
-        }
-
     }
 

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

@@ -4 +4 @@
 
 public interface TemplateExecutor {
+    /**
+     * Executes steps, starting from the startStep up to, but excluding, the endStep.
+     */
     void execute(Step startStep, Step endStep, ExecutionContext context, TemplateResult result) throws SAXException;
 }