X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresponse%2Fclass_BaseResponse.php;h=625c1d95b38f30600c984452bedb7bb86d8a5a1a;hp=4092a010c2772f54ab27542629616233f9b968fc;hb=8d8cf621bd811811cecd83c65a4ab91f27258e79;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php
index 4092a010..625c1d95 100644
--- a/framework/main/classes/response/class_BaseResponse.php
+++ b/framework/main/classes/response/class_BaseResponse.php
@@ -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('application');
 
 		// 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('application');
 
 		// 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('application');
 
 		// Generate config key
 		$configKey = sprintf('default_%s_%s_command',