Continued:

[core.git] / framework / main / classes / class_BaseFrameworkSystem.php

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 0390d528d228f141e3462efa265ca7552185fc46..8ba9d8ce98f6d6f63ac33562fe388a494f09e541 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -774,7 +774,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setConfigInstance (FrameworkConfiguration $configInstance) {
-               Registry::getRegistry()->addInstance('config', $configInstance);
+               GenericRegistry::getRegistry()->addInstance('config', $configInstance);
        }
 
        /**
@@ -794,7 +794,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setDebugInstance (DebugMiddleware $debugInstance) {
-               Registry::getRegistry()->addInstance('debug', $debugInstance);
+               GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
        }
 
        /**
@@ -817,7 +817,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setWebOutputInstance (OutputStreamer $webInstance) {
-               Registry::getRegistry()->addInstance('web_output', $webInstance);
+               GenericRegistry::getRegistry()->addInstance('web_output', $webInstance);
        }
 
        /**
@@ -837,7 +837,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setDatabaseInstance (DatabaseConnection $databaseInstance) {
-               Registry::getRegistry()->addInstance('db_instance', $databaseInstance);
+               GenericRegistry::getRegistry()->addInstance('db_instance', $databaseInstance);
        }
 
        /**
@@ -860,7 +860,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setCompressorChannel (CompressorChannel $compressorInstance) {
-               Registry::getRegistry()->addInstance('compressor', $compressorInstance);
+               GenericRegistry::getRegistry()->addInstance('compressor', $compressorInstance);
        }
 
        /**
@@ -890,7 +890,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @return      void
         */
        public final function setApplicationInstance (ManageableApplication $applicationInstance) {
-               Registry::getRegistry()->addInstance('application', $applicationInstance);
+               GenericRegistry::getRegistry()->addInstance('application', $applicationInstance);
        }
 
        /**
@@ -911,7 +911,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @see         LanguageSystem
         */
        public final function setLanguageInstance (ManageableLanguage $langInstance) {
-               Registry::getRegistry()->addInstance('language', $langInstance);
+               GenericRegistry::getRegistry()->addInstance('language', $langInstance);
        }
 
        /**
@@ -1632,7 +1632,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                // Is the application instance set?
                if (is_null($applicationInstance)) {
                        // Get the current instance
-                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                        // Still null?
                        if (is_null($applicationInstance)) {
@@ -1792,7 +1792,7 @@ Loaded includes:
                        DebugMiddleware::getSelfInstance()->output('');
 
                        // Set it in registry
-                       Registry::getRegistry()->addInstance('debug', $debugInstance);
+                       GenericRegistry::getRegistry()->addInstance('debug', $debugInstance);
                } else {
                        // Get instance from registry
                        $debugInstance = GenericRegistry::getRegistry()->getDebugInstance();
@@ -3123,7 +3123,7 @@ Loaded includes:
         */
        protected function initWebOutputInstance () {
                // Get application instance
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Init web output instance
                $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($applicationInstance));