X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fclient%2Fclass_ClientFactory.php;h=3b182f8f7135c9cb99d853fc2014744f615dde34;hp=f02c06f347679e53450a3a21afb3a627242bb7b5;hb=refs%2Fheads%2Fmaster;hpb=8d8cf621bd811811cecd83c65a4ab91f27258e79

diff --git a/framework/main/classes/factories/client/class_ClientFactory.php b/framework/main/classes/factories/client/class_ClientFactory.php
index f02c06f3..3b182f8f 100644
--- a/framework/main/classes/factories/client/class_ClientFactory.php
+++ b/framework/main/classes/factories/client/class_ClientFactory.php
@@ -2,12 +2,16 @@
 // Own namespace
 namespace Org\Mxchange\CoreFramework\Factory\Client;
 
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+
 /**
  * An object factory for clients
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -24,13 +28,13 @@ namespace Org\Mxchange\CoreFramework\Factory\Client;
  * 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 ClientFactory extends ObjectFactory {
+class ClientFactory extends BaseFactory {
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -51,18 +55,18 @@ class ClientFactory extends ObjectFactory {
 		$registryKey = strtolower($protocolInstance->getProtocolName()) . '_client';
 
 		// Is the key already in registry?
-		if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
+		if (ObjectRegistry::getRegistry('factory')->instanceExists($registryKey)) {
 			// Then use that instance
-			$clientInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
+			$clientInstance = ObjectRegistry::getRegistry('factory')->getInstance($registryKey);
 
 			// Set socket resource
 			$clientInstance->setSocketResource($socketResource);
 		} else {
 			// Generate object instance
-			$clientInstance = self::createObjectByConfiguredName($registryKey, array($socketResource));
+			$clientInstance = ObjectFactory::createObjectByConfiguredName($registryKey, array($socketResource));
 
 			// Set it in registry for later re-use
-			GenericRegistry::getRegistry()->addInstance($registryKey, $clientInstance);
+			ObjectRegistry::getRegistry('factory')->addInstance($registryKey, $clientInstance);
 		}
 
 		// Return the prepared instance