X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlStatusCommand.php;h=485ca585e63d70985818beecf930943db8621090;hb=fea88c89d790fd1cc5101744e675a99db097d0a8;hp=429e3719abb004fdd1485ba690bb2a2c4808c526;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/commands/html/class_HtmlStatusCommand.php b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
index 429e3719..485ca585 100644
--- a/framework/main/classes/commands/html/class_HtmlStatusCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlStatusCommand.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Command\Status;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -16,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlStatusCommand.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/commands/html/class_HtmlStatusCommand.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -75,42 +72,39 @@ class HtmlStatusCommand extends BaseCommand implements Commandable {
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get the application instance
-		$applicationInstance = Registry::getRegistry()->getInstance('app');
-
-		// Prepare a template instance
-		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Transfer application data
-		$templateInstance->assignApplicationData($applicationInstance);
+		$this->getTemplateInstance()->assignApplicationData();
 
 		// Load the master template
 		$masterTemplate = $applicationInstance->buildMasterTemplateName();
 
 		// Load header template
-		$templateInstance->loadCodeTemplate('header');
+		$this->getTemplateInstance()->loadCodeTemplate('header');
 
 		// Compile and assign it with a variable
-		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('header', 'header');
+		$this->getTemplateInstance()->compileTemplate();
+		$this->getTemplateInstance()->assignTemplateWithVariable('header', 'header');
 
 		// Load footer template
-		$templateInstance->loadCodeTemplate('footer');
+		$this->getTemplateInstance()->loadCodeTemplate('footer');
 
 		// Compile and assign it with a variable
-		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('footer', 'footer');
+		$this->getTemplateInstance()->compileTemplate();
+		$this->getTemplateInstance()->assignTemplateWithVariable('footer', 'footer');
 
 		// Load the status template
-		$templateInstance->loadCodeTemplate('status');
+		$this->getTemplateInstance()->loadCodeTemplate('status');
 
 		// Assign the status template with the master template as a content ... ;)
-		$templateInstance->assignTemplateWithVariable('status', 'main_content');
+		$this->getTemplateInstance()->assignTemplateWithVariable('status', 'main_content');
 
 		// Load the master template
-		$templateInstance->loadCodeTemplate($masterTemplate);
+		$this->getTemplateInstance()->loadCodeTemplate($masterTemplate);
 
 		// Set title
-		$templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_status_title'));
+		$this->getTemplateInstance()->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('page_status_title'));
 
 		// Construct the menu in every command. We could do this in BaseCommand class. But this means
 		// *every* command has a navigation system and that is want we don't want.
@@ -120,17 +114,17 @@ class HtmlStatusCommand extends BaseCommand implements Commandable {
 		$menuInstance->renderMenu();
 
 		// Transfer it to the template engine instance
-		$menuInstance->transferContentToTemplateEngine($templateInstance);
+		$menuInstance->transferContentToTemplateEngine($this->getTemplateInstance());
 
 		/*
 		 * ... and all variables. This should be merged together in a pattern
 		 * to make things easier. A cache mechanism should be added between
 		 * these two calls to cache compiled templates.
 		 */
-		$templateInstance->compileVariables();
+		$this->getTemplateInstance()->compileVariables();
 
 		// Get the content back from the template engine and put it in response class
-		$templateInstance->transferToResponse($responseInstance);
+		$this->getTemplateInstance()->transferToResponse($responseInstance);
 	}
 
 	/**