X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLoginAreaCommand.php;h=dbbd45185249229c45b1269f440e46836069aa63;hp=728fcddb9e7dd890c339c6b1ee1e9dc6bc413d27;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 728fcddb..dbbd4518 100644
--- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -8,7 +8,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -18,11 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLoginAreaCommand.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_HtmlLoginAreaCommand.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -93,7 +89,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get the action instance from registry
-		$actionInstance = Registry::getRegistry()->getInstance('action');
+		$actionInstance = GenericRegistry::getRegistry()->getInstance('action');
 
 		// Do we have an action here?
 		if ($actionInstance instanceof PerformableAction) {
@@ -102,7 +98,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
 		} // END - if
 
 		// Get the application instance
-		$applicationInstance = Registry::getRegistry()->getInstance('app');
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
 		// Prepare a template instance
 		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
@@ -183,7 +179,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
 		$actionInstance = NULL;
 
 		// Get registry
-		$registryInstance = Registry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Get our application instance from the registry
 		$applicationInstance = $registryInstance->getInstance('application');
@@ -201,7 +197,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
 		} // END - if
 
 		// Get application instance
-		$applicationInstance = Registry::getRegistry()->getInstance('app');
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
 		// Get a resolver
 		$actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance);