Continued:

[city.git] / application / city / classes / factories / manager / class_ManagerFactory.php

diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
index 7c2b5bebf0bae8f0b691a817b31f6e4dd2d138bc..20295e4146ea534065faa6b34dd2a010ae7fc4ba 100644 (file)
--- a/application/city/classes/factories/manager/class_ManagerFactory.php
+++ b/application/city/classes/factories/manager/class_ManagerFactory.php
@@ -3,15 +3,16 @@
 namespace Org\Mxchange\City\Factory\Manager;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 
 /**
  * A factory class for managers
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2015, 2016 City Developer Team
+ * @copyright  Copyright (c) 2015 - 2023 City Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -28,7 +29,7 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class ManagerFactory extends ObjectFactory {
+class ManagerFactory extends BaseFactory {
        /**
         * Protected constructor
         *
@@ -53,15 +54,15 @@ class ManagerFactory extends ObjectFactory {
                $key = $type . '_manager';
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($key)) {
+               if (ObjectRegistry::getRegistry('factory')->instanceExists($key)) {
                        // Get handler from registry
-                       $managerInstance = Registry::getRegistry()->getInstance($key);
+                       $managerInstance = ObjectRegistry::getRegistry('factory')->getInstance($key);
                } else {
                        // Get the proper manager instance
                        $managerInstance = ObjectFactory::createObjectByConfiguredName($key . '_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($key, $managerInstance);
+                       ObjectRegistry::getRegistry('factory')->addInstance($key, $managerInstance);
                }
 
                // Return the instance