Continued:

[core.git] / framework / main / classes / factories / client / class_ClientFactory.php

diff --git a/framework/main/classes/factories/client/class_ClientFactory.php b/framework/main/classes/factories/client/class_ClientFactory.php
index 38f1bf83686edcb28f3774f1cde0634da967afec..7e06320a956a841ae03364dd1923a68f0201dea2 100644 (file)
--- a/framework/main/classes/factories/client/class_ClientFactory.php
+++ b/framework/main/classes/factories/client/class_ClientFactory.php
@@ -1,17 +1,16 @@
 <?php
 // Own namespace
-namespace CoreFramework\Factory\Client;
+namespace Org\Mxchange\CoreFramework\Factory\Client;
 
 // Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 
 /**
  * An object factory for clients
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -55,9 +54,9 @@ class ClientFactory extends ObjectFactory {
                $registryKey = strtolower($protocolInstance->getProtocolName()) . '_client';
 
                // Is the key already in registry?
-               if (Registry::getRegistry()->instanceExists($registryKey)) {
+               if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
                        // Then use that instance
-                       $clientInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $clientInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
 
                        // Set socket resource
                        $clientInstance->setSocketResource($socketResource);
@@ -66,7 +65,7 @@ class ClientFactory extends ObjectFactory {
                        $clientInstance = self::createObjectByConfiguredName($registryKey, array($socketResource));
 
                        // Set it in registry for later re-use
-                       Registry::getRegistry()->addInstance($registryKey, $clientInstance);
+                       GenericRegistry::getRegistry()->addInstance($registryKey, $clientInstance);
                }
 
                // Return the prepared instance