Continued:

[core.git] / framework / main / classes / controller / class_BaseController.php

diff --git a/framework/main/classes/controller/class_BaseController.php b/framework/main/classes/controller/class_BaseController.php
index 729f51e1dd1108fb6dd7ac9ed00a4ba52c6a5c31..c871c0e31fe553e237b000bd5d4207c5a7738e29 100644 (file)
--- a/framework/main/classes/controller/class_BaseController.php
+++ b/framework/main/classes/controller/class_BaseController.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Chain\Filter\InvalidFilterChainException;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -19,11 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/class_BaseController.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/controller/class_BaseController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -68,7 +64,7 @@ abstract class BaseController extends BaseFrameworkSystem implements Registerabl
                $this->initFilterChain(self::FILTER_CHAIN_POST_COMMAND);
 
                // Add this controller to the registry
-               Registry::getRegistry()->addInstance('controller', $this);
+               GenericRegistry::getRegistry()->addInstance('controller', $this);
        }
 
        /**