Renamed 'stacker' -> 'stack'

[hub.git] / application / hub / main / template / class_BaseXmlTemplateEngine.php

diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php
index ba1b9b8b8355e1cabf42693345350eed476a2770..ca168bf52d05099a02b70880296e1dedd9871a49 100644 (file)
--- a/application/hub/main/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php
@@ -48,6 +48,11 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         */
        private $typePrefix = 'xml';
 
+       /**
+        * Name of stacker
+        */
+       private $stackerName = '';
+
        /**
         * Content from dependency
         */
@@ -112,8 +117,11 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                // Init a variable stacker
                $stackerInstance = ObjectFactory::createObjectByConfiguredName($typePrefix . '_' . $xmlTemplateType . '_stacker_class');
 
+               // Set name
+               $this->stackerName = $typePrefix . '_' . $xmlTemplateType;
+
                // Init stacker
-               $stackerInstance->initStacker($typePrefix . '_' . $xmlTemplateType);
+               $stackerInstance->initStack($this->stackerName);
 
                // Set it
                $this->setStackerInstance($stackerInstance);
@@ -174,6 +182,15 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
                return $this->mainNodes;
        }
 
+       /**
+        * Getter for stacker name
+        *
+        * @return      $stackerName    Name of stacker of this class
+        */
+       protected final function getStackerName () {
+               return $this->stackerName;
+       }
+
        /**
         * Getter for sub node array
         *
@@ -206,10 +223,13 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         * @return      void
         */
        protected function handleTemplateDependency ($node, $templateDependency) {
+               // Check that node is not empty
+               assert(!empty($node));
+
                // Is the template dependency set?
                if ((!empty($templateDependency)) && (!isset($this->dependencyContent[$node]))) {
                        // Get a temporay template instance
-                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '__' . $this->xmlTemplateType . '_template_class');
+                       $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance($this->typePrefix . '_' . $this->convertDashesToUnderscores($node) . '_' . $this->xmlTemplateType . '_template_class');
 
                        // Then load it
                        $templateInstance->loadXmlTemplate($templateDependency);
@@ -266,7 +286,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine {
         * @return      void
         * @throws      XmlNodeMismatchException        If current main node mismatches the closing one
         */
-       public final function endElement ($resource, $nodeName) {
+       public final function finishElement ($resource, $nodeName) {
                // Make all lower-case
                $nodeName = strtolower($nodeName);