Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / factories / xml / class_XmlTemplateEngineFactory.php

diff --git a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 7b92ab7215d4766d43933a27752d4a214c68788f..7c544b6887ce58a402fd064a4ef7e230dbcae8ec 100644 (file)
--- a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Template;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for XML template engines. All instances generated by this
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -55,9 +51,9 @@ class XmlTemplateEngineFactory extends ObjectFactory {
         */
        public static final function createXmlTemplateEngineInstance ($configEntry) {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists($configEntry)) {
+               if (GenericRegistry::getRegistry()->instanceExists($configEntry)) {
                        // Then use this instance
-                       $templateInstance = Registry::getRegistry()->getInstance($configEntry);
+                       $templateInstance = GenericRegistry::getRegistry()->getInstance($configEntry);
                } else {
                        // Now prepare the tags instance
                        $templateInstance = ObjectFactory::createObjectByConfiguredName($configEntry);