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

[core.git] / framework / main / classes / template / html / class_HtmlTemplateEngine.php

diff --git a/framework/main/classes/template/html/class_HtmlTemplateEngine.php b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
index 706b4a2fc34e33a0023b23a64a77347320f255bd..9d1bb119ccd9ec0cfe22fe9b1e7b5da2ca3ae96c 100644 (file)
--- a/framework/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Template\Engine;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
@@ -17,11 +17,7 @@ use \UnexpectedValueException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/html/class_HtmlTemplateEngine.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/template/html/class_HtmlTemplateEngine.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -64,7 +60,7 @@ class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $templateInstance = new HtmlTemplateEngine();
 
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Determine base path
                $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';