Continued:

[core.git] / framework / main / classes / template / xml / class_BaseXmlTemplateEngine.php

diff --git a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
index 892bb09df652ab14c7647ce83e39118cdfa1b1fa..cbbf4a736a026a290ef65fe393ab7d1330c0d66a 100644 (file)
--- a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
+++ b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine\Xml;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Factory\Template\XmlTemplateEngineFactory;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
@@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 use Org\Mxchange\CoreFramework\Template\Xml\CompileableXmlTemplate;
 use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait;
 use Org\Mxchange\CoreFramework\Traits\Template\CompileableTemplateTrait;
-use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
+use Org\Mxchange\CoreFramework\Utils\Strings\StringUtils;
 
 // Import SPL stuff
 use \InvalidArgumentException;
@@ -86,6 +86,11 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
         */
        private $xmlCompacting = false;
 
+       /**
+        * Method name for XML template type
+        */
+       private $initMethodName = 'invalid';
+
        /**
         * Protected constructor
         *
@@ -114,6 +119,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                // Set XML template type and prefix
                $this->xmlTemplateType = $xmlTemplateType;
                $this->typePrefix      = $typePrefix;
+               $this->initMethodName = sprintf('init%s', StringUtils::convertToClassName($this->xmlTemplateType));
 
                // Get template instance
                $applicationInstance = ApplicationHelper::getSelfInstance();
@@ -173,7 +179,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (empty($templateName)) {
                        // Set generic template name
                        $templateName = $this->typePrefix . '_' . $this->xmlTemplateType . '_template_type';
-               } // END - if
+               }
 
                // Set template type
                $this->setTemplateType(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($templateName));
@@ -260,7 +266,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (is_null($value)) {
                        // Bah, needs fixing.
                        $this->debugInstance(sprintf('[%s:%d]: key=%s returns NULL', __METHOD__, __LINE__, $key));
-               } // END - if
+               }
 
                // Return value
                return $value;
@@ -290,7 +296,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 
                        // Save the parsed raw content in our dependency array
                        $this->dependencyContent[$node] = $templateInstance->getRawTemplateData();
-               } // END - if
+               }
        }
 
        /**
@@ -304,7 +310,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
         */
        public final function startElement ($resource, string $element, array $attributes) {
                // Initial method name which will never be called...
-               $methodName = 'init' . StringUtils::convertToClassName($this->xmlTemplateType);
+               $methodName = $this->initMethodName;
 
                // Make the element name lower-case
                $element = strtolower($element);
@@ -346,7 +352,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) {
                        // Did not match!
                        throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), XmlParser::EXCEPTION_XML_NODE_MISMATCH);
-               } // END - if
+               }
 
                // Construct method name
                $methodName = 'finish' . StringUtils::convertToClassName($nodeName);