X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fregistry%2Fclass_SocketRegistryFactory.php;h=9cfcf3e22ad49d8f74a6d8524e80e8e2bc1ec4dd;hp=150acfaa7c4925cbef8a21f39c19ae5ef07691e9;hb=refs%2Fheads%2Fmaster;hpb=a60894f1d6ef33613d2d0351075aa07aa257f304

diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
index 150acfaa..a3b985c4 100644
--- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -3,15 +3,16 @@
 namespace Org\Mxchange\CoreFramework\Factory\Registry\Socket;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 
 /**
  * A factory class for socket registries
  *
  * @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 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -28,13 +29,13 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
  * 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 SocketRegistryFactory extends ObjectFactory {
+class SocketRegistryFactory extends BaseFactory {
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -48,21 +49,26 @@ class SocketRegistryFactory extends ObjectFactory {
 	 */
 	public static final function createSocketRegistryInstance () {
 		// Get registry instance
-		$registryInstance = GenericRegistry::getRegistry();
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('SOCKET-REGISTRY-FACTORY: CALLED!');
+		$objectRegistryInstance = ObjectRegistry::getRegistry('factory');
 
 		// Do we have an instance in the registry?
-		if ($registryInstance->instanceExists('socket_registry')) {
+		if ($objectRegistryInstance->instanceExists('socket_registry')) {
 			// Then use this instance
-			$registryInstance = $registryInstance->getInstance('socket_registry');
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Getting socket registry instance ...');
+			$registryInstance = $objectRegistryInstance->getInstance('socket_registry');
 		} else {
 			// Get the registry instance
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Creating new socket registry instance ...');
 			$registryInstance = ObjectFactory::createObjectByConfiguredName('socket_registry_class');
 
 			// Set the instance in registry for further use
-			$registryInstance->addInstance('socket_registry', $registryInstance);
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('SOCKET-REGISTRY-FACTORY: Adding socket registry instance ...');
+			$objectRegistryInstance->addInstance('socket_registry', $registryInstance);
 		}
 
 		// Return the instance
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('SOCKET-REGISTRY-FACTORY: registryInstance=%s - EXIT!', $registryInstance->__toString()));
 		return $registryInstance;
 	}