Continued:

[city.git] / application / city / classes / factories / city_daemon / class_CityDaemonFactory.php

diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
index 137e2423cdf09985324b13f7f720c52b6a68915f..c4ada485fa2865668c8908d01574aa8734849929 100644 (file)
--- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
+++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Daemon\Factory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -53,9 +54,9 @@ class CityDaemonFactory extends ObjectFactory {
                $factoryInstance = new CityDaemonFactory();
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('city')) {
+               if (GenericRegistry::getRegistry()->instanceExists('city')) {
                        // Get handler from registry
-                       $cityInstance = Registry::getRegistry()->getInstance('city');
+                       $cityInstance = GenericRegistry::getRegistry()->getInstance('city');
                } elseif (($requestInstance instanceof Requestable) && ($responseInstance instanceof Responseable)) {
                        // The default city-mode is from our configuration
                        $cityMode = $factoryInstance->getConfigInstance()->getConfigEntry('city_default_mode');
@@ -70,13 +71,13 @@ class CityDaemonFactory extends ObjectFactory {
                        }
 
                        // Now convert the city-mode in a class name
-                       $className = 'Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
+                       $className = 'Org\Mxchange\City\Daemon\Simulation\Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
 
                        // Get the city instance
                        $cityInstance = ObjectFactory::createObjectByName($className, array($requestInstance));
 
                        // Get a registry
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                        // Set the app instance
                        $cityInstance->setApplicationInstance($applicationInstance);