X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fxml%2Fclass_XmlTemplateEngineFactory.php;fp=framework%2Fmain%2Fclasses%2Ffactories%2Fxml%2Fclass_XmlTemplateEngineFactory.php;h=7c544b6887ce58a402fd064a4ef7e230dbcae8ec;hp=7b92ab7215d4766d43933a27752d4a214c68788f;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/framework/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 7b92ab72..7c544b68 100644
--- 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);