Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git] / framework / main / classes / response / class_BaseResponse.php
index 4092a01..0c2c8a1 100644 (file)
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A generic request class
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/response/class_BaseResponse.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/response/class_BaseResponse.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -156,7 +152,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public final function addFatalMessage ($messageId) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Adds the resolved message id to the fatal message list
                $this->addFatalMessagePlain($applicationInstance()->getLanguageInstance()->getMessage($messageId));
@@ -184,7 +180,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public function flushBuffer ($force = false) {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Headers already sent?
                if ((headers_sent()) && ($force === false)) {
@@ -247,7 +243,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
         */
        public function determineDefaultCommand () {
                // Get application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
                // Generate config key
                $configKey = sprintf('default_%s_%s_command',