]> git.mxchange.org Git - hub.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sat, 20 Jan 2018 18:45:29 +0000 (19:45 +0100)
committerRoland Häder <roland@mxchange.org>
Fri, 21 Aug 2020 16:50:11 +0000 (18:50 +0200)
- Registry was renamed to GenericRegistry

Signed-off-by: Roland Häder <roland@mxchange.org>
101 files changed:
application/hub/class_ApplicationHelper.php
application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
application/hub/classes/commands/console/class_HubConsoleChatCommand.php
application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
application/hub/classes/commands/console/class_HubConsoleMainCommand.php
application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
application/hub/classes/crawler/class_BaseNodeCrawler.php
application/hub/classes/cruncher/class_BaseHubCruncher.php
application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
application/hub/classes/factories/class_
application/hub/classes/factories/client/class_ClientFactory.php
application/hub/classes/factories/communicator/class_CommunicatorFactory.php
application/hub/classes/factories/decoder/class_DecoderFactory.php
application/hub/classes/factories/dht/class_DhtObjectFactory.php
application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
application/hub/classes/factories/info/class_ConnectionInfoFactory.php
application/hub/classes/factories/lists/class_RecipientListFactory.php
application/hub/classes/factories/locator/class_UniversalNodeLocatorFactory.php
application/hub/classes/factories/node/class_NodeObjectFactory.php
application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
application/hub/classes/factories/package/class_NetworkPackageFactory.php
application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
application/hub/classes/factories/producer/class_ProducerFactory.php
application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
application/hub/classes/factories/socket/class_SocketFactory.php
application/hub/classes/factories/source/units/class_UnitSourceFactory.php
application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
application/hub/classes/factories/states/miner/class_MinerStateFactory.php
application/hub/classes/factories/tags/class_PackageTagsFactory.php
application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php
application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap
application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php
application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php
application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap
application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php
application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php
application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap
application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php
application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php
application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap
application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php
application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php
application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php
application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap
application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php
application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php
application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php
application/hub/classes/filter/chat/class_ChatInitializationFilter.php
application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php
application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php
application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php
application/hub/classes/filter/miner/class_MinerInitializationFilter.php
application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php
application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php
application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php
application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php
application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php
application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php
application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php
application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
application/hub/classes/handler/data/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
application/hub/classes/helper/connection/class_BaseConnectionHelper.php
application/hub/classes/miner/class_BaseHubMiner.php
application/hub/classes/nodes/boot/class_HubBootNode.php
application/hub/classes/nodes/class_BaseHubNode.php
application/hub/classes/nodes/list/class_HubListNode.php
application/hub/classes/nodes/master/class_HubMasterNode.php
application/hub/classes/nodes/regular/class_HubRegularNode.php
application/hub/classes/package/class_NetworkPackage.php
application/hub/classes/pools/class_BasePool.php
application/hub/classes/producer/class_BaseProducer.php
application/hub/classes/tags/package/class_PackageTags.php
application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php
application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php
application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php
application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php
application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php
application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php
application/hub/classes/template/class_BaseXmlTemplateEngine.php
application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
core

index e31e1a08d31e00376c7732245da0cea019115578..584f8fdf3f053fbba85a872aa4cfb712ffe38c53 100644 (file)
@@ -11,8 +11,8 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
index b56b193f8985e1a66adbd3daefe1448b65b4c964..3f931383b42abdbfb2048f0e4bf5bca3ed26e403 100644 (file)
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -72,7 +72,7 @@ class HubConsoleAptProxyCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -85,13 +85,13 @@ class HubConsoleAptProxyCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
                // Get apt-proxy instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Add some apt-proxy-specific filters
                $proxyInstance->addExtraAptProxyFilters();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index 78bde34658f1d8d4be7919096a472cad7295932c..fb95de6d0b552b63ef89a014e4347f33c519cb0b 100644 (file)
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -72,7 +72,7 @@ class HubConsoleChatCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -85,13 +85,13 @@ class HubConsoleChatCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
                // Get chat instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Add some chat-specific filters
                $chatInstance->addExtraChatFilters();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index fc0459c43035cc4600ba31a9b0915eec12006801..47a39f8f2c6e08acda8650126d8b6d6f32937597 100644 (file)
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -72,7 +72,7 @@ class HubConsoleCrawlerCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -85,13 +85,13 @@ class HubConsoleCrawlerCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
                // Get crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Add some crawler-specific filters
                $crawlerInstance->addExtraCrawlerFilters();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index 3537e5c29b022a4d9f113f80ec38a6fc9132fd09..d9d319e48d730de0d770c5ef4880570b8e42abc5 100644 (file)
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -72,7 +72,7 @@ class HubConsoleCruncherCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -85,13 +85,13 @@ class HubConsoleCruncherCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
                // Get cruncher instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Add some cruncher-specific filters
                $cruncherInstance->addExtraCruncherFilters();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index bae067d51ff280d225b069f140c79cce15a49387..f72526cc3ba3d288c2f015cd674c4fe3d655becd 100644 (file)
@@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -75,7 +75,7 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -101,7 +101,7 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable {
                $nodeInstance->activateNode($requestInstance, $responseInstance);
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index 7e421aabf72db4b4d62d1751de91a5eec770fa90..5fdce95c8f903fde6d9703a8e114f24f70b3ff40 100644 (file)
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -72,7 +72,7 @@ class HubConsoleMinerCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------
@@ -85,13 +85,13 @@ class HubConsoleMinerCommand extends BaseCommand implements Commandable {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Add some miner-specific filters
                $minerInstance->addExtraMinerFilters();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: --- Entering main loop. ---');
index 37c11b95790cd2f324b42fc35e5a6152ecf67c1d..796ad81817af124b2b256e088c557c075aee7be3 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Factory\State\CrawlerStateFactory;
 use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\State\Stateable;
 
 /**
@@ -49,7 +49,7 @@ abstract class BaseNodeCrawler extends BaseHubSystem {
                parent::__construct($className);
 
                // Set this crawler instance in registry
-               Registry::getRegistry()->addInstance('crawler', $this);
+               GenericRegistry::getRegistry()->addInstance('crawler', $this);
 
                // Init state which sets the state to 'init'
                $this->initState();
index 3afa60516222c2fea18d54d22812999b4d9ac700..6aa01bf8b694338f5aa6d294405d91da04b8ac1e 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A general hub cruncher class
@@ -69,7 +69,7 @@ abstract class BaseHubCruncher extends BaseHubSystem implements Updateable {
                parent::__construct($className);
 
                // Set this cruncher instance in registry
-               Registry::getRegistry()->addInstance('cruncher', $this);
+               GenericRegistry::getRegistry()->addInstance('cruncher', $this);
 
                // Init this cruncher
                $this->initCruncher();
index 9d1bf5499437bb3d0bef6cf27f750162de66ad05..2bcfb5cd94e55b9b535764366af9f5f645cdaaed 100644 (file)
@@ -17,8 +17,8 @@ use Org\Shipsimu\Hub\Resolver\State\Peer\PeerStateResolver;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Socket\InvalidSocketException;
 
 // Import SPL stuff
@@ -221,7 +221,7 @@ class PackageSocketDiscovery extends BaseRecipientDiscovery implements Discovera
                // Try to resolve the socket resource
                try {
                        // Get the helper instance from registry
-                       $helperInstance = Registry::getRegistry()->getInstance('connection');
+                       $helperInstance = GenericRegistry::getRegistry()->getInstance('connection');
 
                        // Possibly noisy debug message
                        /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('PACKAGE-SOCKET-DISCOVERY: Going to resolve socket from peer state and given package data ...');
index a944c6070c3eaca6a9f78775f801b546762aaa70..e7c444c318b6e4f9f9f1e4a8c771db8be6c5c093 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\FilterChain\Package;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for network packages
@@ -47,12 +47,12 @@ class PackageFilterChainFactory extends ObjectFactory {
         */
        public static final function createChainByTagsArray (array $tags) {
                // Get a registry key from tags array, this does mostly call implode()
-               $registryKey = Registry::getRegistryKeyFromArray('package_filter_chain', $tags);
+               $registryKey = GenericRegistry::getRegistryKeyFromArray('package_filter_chain', $tags);
 
                // Is the registry key there?
-               if (Registry::getRegistry()->instanceExists($registryKey)) {
+               if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
                        // Yes, then use that instance
-                       $chainInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $chainInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
                } else {
                        // Initialize a filter chain class
                        $chainInstance = self::createObjectByConfiguredName('package_filter_chain_class');
@@ -72,13 +72,11 @@ class PackageFilterChainFactory extends ObjectFactory {
                        } // END - foreach
 
                        // Add the finished chain to the registry
-                       Registry::getRegistry()->addInstance($registryKey, $chainInstance);
+                       GenericRegistry::getRegistry()->addInstance($registryKey, $chainInstance);
                }
 
                // Return the chain instance
                return $chainInstance;
        }
-}
 
-// [EOF]
-?>
+}
index 74e3571a10d2e7f7e89b308698ce7b41d44058a9..4053243172c1e09c614acbc35b5b80e74429c4f4 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Handler\Chunk;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for chunk handler
@@ -46,21 +46,19 @@ class ChunkHandlerFactory extends ObjectFactory {
         */
        public static final function createChunkHandlerInstance () {
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('chunk_handler')) {
+               if (GenericRegistry::getRegistry()->instanceExists('chunk_handler')) {
                        // Get handler from registry
-                       $handlerInstance = Registry::getRegistry()->getInstance('chunk_handler');
+                       $handlerInstance = GenericRegistry::getRegistry()->getInstance('chunk_handler');
                } else {
                        // Get the handler instance
                        $handlerInstance = self::createObjectByConfiguredName('chunk_handler_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('chunk_handler', $handlerInstance);
+                       GenericRegistry::getRegistry()->addInstance('chunk_handler', $handlerInstance);
                }
 
                // Return the instance
                return $handlerInstance;
        }
-}
 
-// [EOF]
-?>
+}
index fead6053d127bae3a95bbb3c563f1478500ac448..b7bfcbbf8914f87d8a3aa94a6fbc50b7fc3402e3 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Factory\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for !!!
@@ -46,15 +46,15 @@ class ???Factory extends ObjectFactory {
         */
        public static final function create???Instance () {
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('|||')) {
+               if (GenericRegistry::getRegistry()->instanceExists('|||')) {
                        // Get handler from registry
-                       $%%%Instance = Registry::getRegistry()->getInstance('|||');
+                       $%%%Instance = GenericRegistry::getRegistry()->getInstance('|||');
                } else {
                        // Get the handler instance
                        $%%%Instance = self::createObjectByConfiguredName('|||_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('|||', $%%%Instance);
+                       GenericRegistry::getRegistry()->addInstance('|||', $%%%Instance);
                }
 
                // Return the instance
index 07314c411f68c0f55b0233908f14782884601e07..c5349db5b50df48e1f6e647c71f53aae0d2d45be 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Handler\Protocol\HandleableProtocol;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * An object factory for clients
@@ -61,9 +61,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);
 
                        // Is socket instance given?
                        if ($socketInstance instanceof StorableSocket) {
@@ -75,7 +75,7 @@ class ClientFactory extends ObjectFactory {
                        $clientInstance = self::createObjectByConfiguredName($registryKey, array($socketInstance));
 
                        // Set it in registry for later re-use
-                       Registry::getRegistry()->addInstance($registryKey, $clientInstance);
+                       GenericRegistry::getRegistry()->addInstance($registryKey, $clientInstance);
                }
 
                // Return the prepared instance
index 6f751fa92c6082451a70487ae99005c3e791b539..358703523b6e82351d6096e17aed09cfea79ecfb 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Communicator;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for communicator
@@ -50,21 +50,19 @@ class CommunicatorFactory extends ObjectFactory {
         */
        public static final function createCommunicatorInstance ($configEntry, $communicatorType) {
                // If there is no communicator?
-               if (Registry::getRegistry()->instanceExists($communicatorType . '_communicator')) {
+               if (GenericRegistry::getRegistry()->instanceExists($communicatorType . '_communicator')) {
                        // Get communicator from registry
-                       $communicatorInstance = Registry::getRegistry()->getInstance($communicatorType . '_communicator');
+                       $communicatorInstance = GenericRegistry::getRegistry()->getInstance($communicatorType . '_communicator');
                } else {
                        // Get the communicator instance
                        $communicatorInstance = self::createObjectByConfiguredName($configEntry);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($communicatorType . '_communicator', $communicatorInstance);
+                       GenericRegistry::getRegistry()->addInstance($communicatorType . '_communicator', $communicatorInstance);
                }
 
                // Return the instance
                return $communicatorInstance;
        }
-}
 
-// [EOF]
-?>
+}
index 8f3fb582720083b2a03978a79cbe9bb2ba280132..d52be042812adbfccd2a39219343105a2f10a2b2 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Handler\Network\RawData\Chunks\ChunkHandler;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for Decodeable objects
@@ -50,9 +50,9 @@ class DecoderFactory extends ObjectFactory {
         */
        public static final function createPackageDecoderInstance () {
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('package_decoder')) {
+               if (GenericRegistry::getRegistry()->instanceExists('package_decoder')) {
                        // Get handler from registry
-                       $decoderInstance = Registry::getRegistry()->getInstance('package_decoder');
+                       $decoderInstance = GenericRegistry::getRegistry()->getInstance('package_decoder');
                } else {
                        // Get a chunk handler instance
                        $handlerInstance = ChunkHandlerFactory::createChunkHandlerInstance();
@@ -61,7 +61,7 @@ class DecoderFactory extends ObjectFactory {
                        $decoderInstance = self::createObjectByConfiguredName('package_decoder_class', array($handlerInstance));
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('package_decoder', $decoderInstance);
+                       GenericRegistry::getRegistry()->addInstance('package_decoder', $decoderInstance);
                }
 
                // Return the instance
index 7dc5f73487e96a389a9de0076d16c6caed9bf386..20f162c42aa254ddbbedab5468a1775fb84c2249 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Dht;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for DHT objects
@@ -50,21 +50,19 @@ class DhtObjectFactory extends ObjectFactory {
                $name = $prefix . '_dht';
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($name)) {
+               if (GenericRegistry::getRegistry()->instanceExists($name)) {
                        // Get handler from registry
-                       $dhtInstance = Registry::getRegistry()->getInstance($name);
+                       $dhtInstance = GenericRegistry::getRegistry()->getInstance($name);
                } else {
                        // Get the handler instance
                        $dhtInstance = self::createObjectByConfiguredName($name . '_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($name, $dhtInstance);
+                       GenericRegistry::getRegistry()->addInstance($name, $dhtInstance);
                }
 
                // Return the instance
                return $dhtInstance;
        }
-}
 
-// [EOF]
-?>
+}
index b2a7779bd9c9f5565c181d156b43e05f4ad7cc75..f84d307954a84146ea7514d19a60671c095ffdbe 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Discovery\Package;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for package discovery
@@ -48,21 +48,19 @@ class PackageDiscoveryFactory extends ObjectFactory {
         */
        public static final function createPackageDiscoveryInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('package_discovery')) {
+               if (GenericRegistry::getRegistry()->instanceExists('package_discovery')) {
                        // Then use this instance
-                       $discoveryInstance = Registry::getRegistry()->getInstance('package_discovery');
+                       $discoveryInstance = GenericRegistry::getRegistry()->getInstance('package_discovery');
                } else {
                        // Create a new instance
                        $discoveryInstance = self::createObjectByConfiguredName('package_recipient_discovery_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('package_discovery', $discoveryInstance);
+                       GenericRegistry::getRegistry()->addInstance('package_discovery', $discoveryInstance);
                }
 
                // Return the instance
                return $discoveryInstance;
        }
-}
 
-// [EOF]
-?>
+}
index eef385723ac2b108ab0c05edb759d941cc6fa134..8840ec51f3a4d2fe2a4fe79f3fa57beda4ee34c9 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Discovery\Socket;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for socket discovery
@@ -48,15 +48,15 @@ class SocketDiscoveryFactory extends ObjectFactory {
         */
        public static final function createSocketDiscoveryInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('socket_discovery')) {
+               if (GenericRegistry::getRegistry()->instanceExists('socket_discovery')) {
                        // Then use this instance
-                       $discoveryInstance = Registry::getRegistry()->getInstance('socket_discovery');
+                       $discoveryInstance = GenericRegistry::getRegistry()->getInstance('socket_discovery');
                } else {
                        // Create a new instance
                        $discoveryInstance = self::createObjectByConfiguredName('socket_discovery_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('socket_discovery', $discoveryInstance);
+                       GenericRegistry::getRegistry()->addInstance('socket_discovery', $discoveryInstance);
                }
 
                // Return the instance
index 3a55463c50ce23b3cf583059a282e86f4b943ddd..e2f8ff2f23889f48cd1f19392280d717ace8ba9f 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Handler\Message;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for message type handlers
@@ -49,21 +49,19 @@ class MessageTypeHandlerFactory extends ObjectFactory {
         */
        public static final function createMessageTypeHandlerInstance ($messageType) {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('message_type_' . $messageType . '_handler')) {
+               if (GenericRegistry::getRegistry()->instanceExists('message_type_' . $messageType . '_handler')) {
                        // Then use this instance
-                       $handlerInstance = Registry::getRegistry()->getInstance('message_type_' . $messageType . '_handler');
+                       $handlerInstance = GenericRegistry::getRegistry()->getInstance('message_type_' . $messageType . '_handler');
                } else {
                        // Now prepare the tags instance
                        $handlerInstance = self::createObjectByConfiguredName('message_type_' . $messageType . '_handler_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('message_type_' . $messageType . '_handler', $handlerInstance);
+                       GenericRegistry::getRegistry()->addInstance('message_type_' . $messageType . '_handler', $handlerInstance);
                }
 
                // Return the instance
                return $handlerInstance;
        }
-}
 
-// [EOF]
-?>
+}
index a4ff9a8b127749654aefd6ed83d1a9832eced07c..51dee98b6c7034e695446dc8436a52164e85ec9c 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Helper\HubHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for protocol handlers
@@ -52,15 +52,15 @@ class ProtocolHandlerFactory extends ObjectFactory {
         */
        private static function createProtocolHandlerByType ($protocolType) {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists($protocolType . '_protocol_handler')) {
+               if (GenericRegistry::getRegistry()->instanceExists($protocolType . '_protocol_handler')) {
                        // Then use this instance
-                       $handlerInstance = Registry::getRegistry()->getInstance($protocolType . '_protocol_handler');
+                       $handlerInstance = GenericRegistry::getRegistry()->getInstance($protocolType . '_protocol_handler');
                } else {
                        // Now prepare the tags instance
                        $handlerInstance = self::createObjectByConfiguredName($protocolType . '_protocol_handler_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance($protocolType . '_protocol_handler', $handlerInstance);
+                       GenericRegistry::getRegistry()->addInstance($protocolType . '_protocol_handler', $handlerInstance);
                }
 
                // Return the instance
index 18bcbd197fab5f7c98f7354aab2f33a5be4cfc6f..30092a9403d67b1f1076ae255bc9638d9238aaed 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Information\Connection;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for ShareableInfo
@@ -54,15 +54,15 @@ class ConnectionInfoFactory extends ObjectFactory {
                $key = sprintf('connection_info_%s_%s', $protocolName, $type);
 
                // If there is no info?
-               if (Registry::getRegistry()->instanceExists($key)) {
+               if (GenericRegistry::getRegistry()->instanceExists($key)) {
                        // Get info from registry
-                       $infoInstance = Registry::getRegistry()->getInstance($key);
+                       $infoInstance = GenericRegistry::getRegistry()->getInstance($key);
                } else {
                        // Get the info instance
                        $infoInstance = self::createObjectByConfiguredName('connection_info_class', array($type));
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($key, $infoInstance);
+                       GenericRegistry::getRegistry()->addInstance($key, $infoInstance);
                }
 
                // Trace message
index f94169689a5b91d599ded28b88b2a4be55112f1d..1c14a5e4b27e2296b74bb3ca3ce38a48a7f34f09 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Lists\Recipient;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for recipient lists
@@ -48,21 +48,19 @@ class RecipientListFactory extends ObjectFactory {
         */
        public static final function createRecipientListInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('recipient_list')) {
+               if (GenericRegistry::getRegistry()->instanceExists('recipient_list')) {
                        // Then use this instance
-                       $listInstance = Registry::getRegistry()->getInstance('recipient_list');
+                       $listInstance = GenericRegistry::getRegistry()->getInstance('recipient_list');
                } else {
                        // Create a new instance
                        $listInstance = self::createObjectByConfiguredName('recipient_list_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('recipient_list', $listInstance);
+                       GenericRegistry::getRegistry()->addInstance('recipient_list', $listInstance);
                }
 
                // Return the instance
                return $listInstance;
        }
-}
 
-// [EOF]
-?>
+}
index fda188fd5dfa31d486127c585a523c1ad3c9dda8..e58bb56f5761c08a649951db6afba93c7e28d1b5 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Network\Locator;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for LocateableNode
@@ -50,9 +50,9 @@ class UniversalNodeLocatorFactory extends ObjectFactory {
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('UNL-FACTORY: unl=%s - CALLED!', $unl));
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('unl_' . $unl)) {
+               if (GenericRegistry::getRegistry()->instanceExists('unl_' . $unl)) {
                        // Get handler from registry
-                       $unlInstance = Registry::getRegistry()->getInstance('unl_' . $unl);
+                       $unlInstance = GenericRegistry::getRegistry()->getInstance('unl_' . $unl);
                } else {
                        // Get the handler instance
                        $unlInstance = self::createObjectByConfiguredName('universal_node_locator_class');
@@ -61,7 +61,7 @@ class UniversalNodeLocatorFactory extends ObjectFactory {
                        $unlInstance->parseStringAsUnl($unl);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('unl_' . $unl, $unlInstance);
+                       GenericRegistry::getRegistry()->addInstance('unl_' . $unl, $unlInstance);
                }
 
                // Trace message
index 88ce7e9276b7354fa26a1eb16b45db3cbe45add2..dff30a71bbdcd0f1b3334f42927c4408bfe92151 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Node;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -54,9 +54,9 @@ class NodeObjectFactory extends ObjectFactory {
                $factoryInstance = new NodeObjectFactory();
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('node')) {
+               if (GenericRegistry::getRegistry()->instanceExists('node')) {
                        // Get handler from registry
-                       $nodeInstance = Registry::getRegistry()->getInstance('node');
+                       $nodeInstance = GenericRegistry::getRegistry()->getInstance('node');
                } elseif (($requestInstance instanceof Requestable) && ($responseInstance instanceof Responseable)) {
                        // The default node-mode is from our configuration
                        $nodeMode = $factoryInstance->getConfigInstance()->getConfigEntry('node_default_mode');
@@ -81,7 +81,7 @@ class NodeObjectFactory extends ObjectFactory {
                        $nodeInstance = ObjectFactory::createObjectByName($className);
 
                        // Get a registry
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                        // Set the app instance
                        $nodeInstance->setApplicationInstance($applicationInstance);
@@ -90,7 +90,7 @@ class NodeObjectFactory extends ObjectFactory {
                        $nodeInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('node', $nodeInstance);
+                       GenericRegistry::getRegistry()->addInstance('node', $nodeInstance);
                } else {
                        // Throw an exception here
                        throw new FactoryRequiredParameterException($factoryInstance, self::EXCEPTION_FACTORY_REQUIRE_PARAMETER);
index addaf6ea98d27a73363946f91701f553c75a4d28..68ee8c20df28079cbd98305cf109febb4f3bcd59 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for package assembler
@@ -52,21 +52,19 @@ class PackageAssemblerFactory extends ObjectFactory {
         */
        public static final function createAssemblerInstance (Receivable $packageInstance) {
                // If there is no assembler?
-               if (Registry::getRegistry()->instanceExists('package_assembler')) {
+               if (GenericRegistry::getRegistry()->instanceExists('package_assembler')) {
                        // Get assembler from registry
-                       $assemblerInstance = Registry::getRegistry()->getInstance('package_assembler');
+                       $assemblerInstance = GenericRegistry::getRegistry()->getInstance('package_assembler');
                } else {
                        // Get the assembler instance
                        $assemblerInstance = self::createObjectByConfiguredName('package_assembler_class', array($packageInstance));
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('package_assembler', $assemblerInstance);
+                       GenericRegistry::getRegistry()->addInstance('package_assembler', $assemblerInstance);
                }
 
                // Return the instance
                return $assemblerInstance;
        }
-}
 
-// [EOF]
-?>
+}
index c227d3f9871f4f350b24cfcdbbff4e833bbdc88b..5a46f7183249afc23544f441a84b93027aeeecce 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Network;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for network packages
@@ -48,9 +48,9 @@ class NetworkPackageFactory extends ObjectFactory {
         */
        public static final function createNetworkPackageInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('network_package')) {
+               if (GenericRegistry::getRegistry()->instanceExists('network_package')) {
                        // Then use this instance
-                       $packageInstance = Registry::getRegistry()->getInstance('network_package');
+                       $packageInstance = GenericRegistry::getRegistry()->getInstance('network_package');
                } else {
                        /*
                         * Prepare the compressor for our package, ZLIB should be fine but we
@@ -69,7 +69,7 @@ class NetworkPackageFactory extends ObjectFactory {
                        $packageInstance = self::createObjectByConfiguredName('network_package_class', array($compressorInstance));
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('network_package', $packageInstance);
+                       GenericRegistry::getRegistry()->addInstance('network_package', $packageInstance);
                }
 
                // Return the instance
index a6be051e1b6347ea6d2fb6d397ee25d01107b1e7..d894f90e7201734295d113f7cfb024226617d8e2 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Fragmenter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for fragmenter
@@ -49,21 +49,19 @@ class FragmenterFactory extends ObjectFactory {
         */
        public static final function createFragmenterInstance ($fragmenterType) {
                // If there is no fragmenter?
-               if (Registry::getRegistry()->instanceExists($fragmenterType . '_fragmenter')) {
+               if (GenericRegistry::getRegistry()->instanceExists($fragmenterType . '_fragmenter')) {
                        // Get fragmenter from registry
-                       $fragmenterInstance = Registry::getRegistry()->getInstance($fragmenterType . '_fragmenter');
+                       $fragmenterInstance = GenericRegistry::getRegistry()->getInstance($fragmenterType . '_fragmenter');
                } else {
                        // Get the fragmenter instance
                        $fragmenterInstance = self::createObjectByConfiguredName($fragmenterType . '_fragmenter_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($fragmenterType . '_fragmenter', $fragmenterInstance);
+                       GenericRegistry::getRegistry()->addInstance($fragmenterType . '_fragmenter', $fragmenterInstance);
                }
 
                // Return the instance
                return $fragmenterInstance;
        }
-}
 
-// [EOF]
-?>
+}
index 5430763b0ad5405e7c6d201c314aac3ea4afdc6d..55fd7be61a257bb99d1e65db04cc0d06389e6eb9 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Producer;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for producer
@@ -50,21 +50,19 @@ class ProducerFactory extends ObjectFactory {
         */
        public static final function createProducerInstance ($configEntry, $producerType) {
                // If there is no producer?
-               if (Registry::getRegistry()->instanceExists($producerType . '_producer')) {
+               if (GenericRegistry::getRegistry()->instanceExists($producerType . '_producer')) {
                        // Get producer from registry
-                       $producerInstance = Registry::getRegistry()->getInstance($producerType . '_producer');
+                       $producerInstance = GenericRegistry::getRegistry()->getInstance($producerType . '_producer');
                } else {
                        // Get the producer instance
                        $producerInstance = self::createObjectByConfiguredName($configEntry);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($producerType . '_producer', $producerInstance);
+                       GenericRegistry::getRegistry()->addInstance($producerType . '_producer', $producerInstance);
                }
 
                // Return the instance
                return $producerInstance;
        }
-}
 
-// [EOF]
-?>
+}
index 6304115a6529ef348edd16aba15e0070e150b6de..be12c3e6dca56eef1201cd9f0e89624e726c934d 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Registry\Object;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for network packages
@@ -46,21 +46,19 @@ class ObjectTypeRegistryFactory extends ObjectFactory {
         */
        public static final function createObjectTypeRegistryInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('object_type_registry')) {
+               if (GenericRegistry::getRegistry()->instanceExists('object_type_registry')) {
                        // Then use this instance
-                       $registryInstance = Registry::getRegistry()->getInstance('object_type_registry');
+                       $registryInstance = GenericRegistry::getRegistry()->getInstance('object_type_registry');
                } else {
                        // Now prepare the tags instance
                        $registryInstance = self::createObjectByConfiguredName('node_object_type_registry_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('object_type_registry', $registryInstance);
+                       GenericRegistry::getRegistry()->addInstance('object_type_registry', $registryInstance);
                }
 
                // Return the instance
                return $registryInstance;
        }
-}
 
-// [EOF]
-?>
+}
index d337e6b8d044dad069796f1e53f478ea67860412..d40014ca74f0f17be3e0e06bccb481565bebe7e3 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Factory\Resolver\Protocol;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for ProtocolResolver
@@ -50,15 +50,15 @@ class ProtocolResolverFactory extends ObjectFactory {
                $protocolName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('hub_communication_protocol_type');
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($protocolName . '_protocol_resolver')) {
+               if (GenericRegistry::getRegistry()->instanceExists($protocolName . '_protocol_resolver')) {
                        // Get handler from registry
-                       $resolverInstance = Registry::getRegistry()->getInstance($protocolName . '_protocol_resolver');
+                       $resolverInstance = GenericRegistry::getRegistry()->getInstance($protocolName . '_protocol_resolver');
                } else {
                        // Get the handler instance
                        $resolverInstance = self::createObjectByConfiguredName($protocolName . '_protocol_resolver_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($protocolName . '_protocol_resolver', $resolverInstance);
+                       GenericRegistry::getRegistry()->addInstance($protocolName . '_protocol_resolver', $resolverInstance);
                }
 
                // Return the instance
index bd73087d00efa7d2dc5811a357a4c2cccb69fb84..94d54b34317aab0b4266c4d17947a6c9554e241c 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Scanner;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 
 /**
@@ -51,7 +51,7 @@ class ScannerObjectFactory extends ObjectFactory {
                $factoryInstance = new ScannerObjectFactory();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Get scanner type for given task instance by searching it in task handler
                $scannerType = $handlerInstance->searchTask($taskInstance);
@@ -60,15 +60,15 @@ class ScannerObjectFactory extends ObjectFactory {
                assert(!empty($scannerType));
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('scanner_' . $scannerType)) {
+               if (GenericRegistry::getRegistry()->instanceExists('scanner_' . $scannerType)) {
                        // Get handler from registry
-                       $scannerInstance = Registry::getRegistry()->getInstance('scanner_' . $scannerType);
+                       $scannerInstance = GenericRegistry::getRegistry()->getInstance('scanner_' . $scannerType);
                } else {
                        // Get the scanner instance
                        $scannerInstance = ObjectFactory::createObjectByConfiguredName($scannerType);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('scanner_' . $scannerType, $scannerInstance);
+                       GenericRegistry::getRegistry()->addInstance('scanner_' . $scannerType, $scannerInstance);
                }
 
                // Return the instance
index c527163336f2027749b08369d5f16acf9ec77ab9..d0d4a2f344b180a42d9456f9c502bbe2a64d8061 100644 (file)
@@ -13,7 +13,7 @@ use Org\Shipsimu\Hub\Pool\Poolable;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Socket\InvalidSocketException;
 
 // Import SPL stuff
@@ -72,9 +72,9 @@ class SocketFactory extends ObjectFactory {
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FACTORY: Trying to find a socket with registryKey=' . $registryKey);
 
                // Is the key there?
-               if (Registry::getRegistry()->instanceExists($registryKey)) {
+               if (GenericRegistry::getRegistry()->instanceExists($registryKey)) {
                        // Get container instance
-                       $socketInstance = Registry::getRegistry()->getInstance($registryKey);
+                       $socketInstance = GenericRegistry::getRegistry()->getInstance($registryKey);
 
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FACTORY: Using socket ' . $socketInstance->getSocketResource() . '(' . gettype($socketInstance->getSocketResource()) . ') from registry.');
@@ -89,7 +89,7 @@ class SocketFactory extends ObjectFactory {
                        $socketInstance = call_user_func($className . '::createConnectionFromPackageData', $packageData);
 
                        // Register it with the registry
-                       Registry::getRegistry()->addInstance($registryKey, $socketInstance);
+                       GenericRegistry::getRegistry()->addInstance($registryKey, $socketInstance);
 
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SOCKET-FACTORY: Socket is now registered in registry.');
@@ -416,15 +416,15 @@ class SocketFactory extends ObjectFactory {
                $socketProtocol = $socketInstance->getSocketProtocol();
 
                // Is the an iterator instance?
-               if (!Registry::getRegistry()->instanceExists('pool_iterator_' . $socketProtocol)) {
+               if (!GenericRegistry::getRegistry()->instanceExists('pool_iterator_' . $socketProtocol)) {
                        // Create iterator instance
                        $iteratorInstance = $poolInstance->createListIteratorInstance($socketProtocol . '_pool');
 
                        // Now store it in registry
-                       Registry::getRegistry()->addInstance('pool_iterator', $iteratorInstance);
+                       GenericRegistry::getRegistry()->addInstance('pool_iterator', $iteratorInstance);
                } else {
                        // Get iterator from registry
-                       $iteratorInstance = Registry::getRegistry()->getInstance('pool_iterator_' . $socketProtocol);
+                       $iteratorInstance = GenericRegistry::getRegistry()->getInstance('pool_iterator_' . $socketProtocol);
                }
 
                // Is it valid?
index cb9687cf50a9f65483f4b0756893a53d93f0ce1b..7baeac61491a2b84b69f37b0ef7c6b8e70e972b4 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Crawler\Source\Unit;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for unit sources
@@ -47,7 +47,7 @@ class UnitSourceFactory extends ObjectFactory {
         */
        public static final function createUnitSourceInstance ($unitType) {
                // Do we have cache?
-               if (!Registry::getRegistry()->instanceExists($unitType . '_unit_source')) {
+               if (!GenericRegistry::getRegistry()->instanceExists($unitType . '_unit_source')) {
                        // Then construct the class' configuraton entry
                        $className = '' . $unitType . '_unit_source_class';
 
@@ -55,16 +55,14 @@ class UnitSourceFactory extends ObjectFactory {
                        $sourceInstance = self::createObjectByConfiguredName($className);
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($unitType . '_unit_source', $sourceInstance);
+                       GenericRegistry::getRegistry()->addInstance($unitType . '_unit_source', $sourceInstance);
                } else {
                        // Get it from registry
-                       $sourceInstance = Registry::getRegistry()->getInstance($unitType . '_unit_source');
+                       $sourceInstance = GenericRegistry::getRegistry()->getInstance($unitType . '_unit_source');
                }
 
                // For any purposes, return the source instance
                return $sourceInstance;
        }
-}
 
-// [EOF]
-?>
+}
index ac8a99070f7b5759205b5875a01b0268b01aac8f..5dea3a88790070b8edece7811382759dc6f8973d 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Crawler\Source\Url;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 
 /**
@@ -51,7 +51,7 @@ class UrlSourceObjectFactory extends ObjectFactory {
                $factoryInstance = new UrlSourceObjectFactory();
 
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Get source type by looking for given task instance in task handler
                $sourceType = $handlerInstance->searchTask($taskInstance);
@@ -60,15 +60,15 @@ class UrlSourceObjectFactory extends ObjectFactory {
                assert(!empty($sourceType));
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists('source_' . $sourceType)) {
+               if (GenericRegistry::getRegistry()->instanceExists('source_' . $sourceType)) {
                        // Get handler from registry
-                       $sourceInstance = Registry::getRegistry()->getInstance('source_' . $sourceType);
+                       $sourceInstance = GenericRegistry::getRegistry()->getInstance('source_' . $sourceType);
                } else {
                        // Get the source instance
                        $sourceInstance = self::createObjectByConfiguredName($sourceType . '_class');
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance('source_' . $sourceType, $sourceInstance);
+                       GenericRegistry::getRegistry()->addInstance('source_' . $sourceType, $sourceInstance);
                }
 
                // Return the instance
index f05631534f56d998802faec5c95095003b4b5cd0..31ffe7eb9ce5b3f8c7f211036334d664975a3fc6 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Crawler\Factory\State;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for crawler states
@@ -54,7 +54,7 @@ class CrawlerStateFactory extends ObjectFactory {
                $stateInstance = self::createObjectByConfiguredName($className);
 
                // Get crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-STATE-FACTORY: Crawler state has changed from ' . $crawlerInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
index 4904d7d6b8f51dad8330216b30b69ab83d9b42ca..466e1cb3001f4a8711f19a8e27c10d24d2d005e2 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\State\Cruncher;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for cruncher states
@@ -52,7 +52,7 @@ class CruncherStateFactory extends ObjectFactory {
                $className = 'cruncher_' . $stateName . '_state_class';
 
                // Get cruncher instance from registry
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Get a class from that configuration entry
                $stateInstance = self::createObjectByConfiguredName($className);
index 50339d430d09515d93760aab0a2926ae226218f6..924476590767352f2863a81965cc0f242b479983 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\State\Miner;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for miner states
@@ -51,7 +51,7 @@ class MinerStateFactory extends ObjectFactory {
                $className = 'miner_' . $stateName . '_state_class';
 
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Get a class from that configuration entry
                $stateInstance = self::createObjectByConfiguredName($className);
index e23e3357ddea2de3d999c99de061550e5ca59586..e03fbead7de0b166d1fcb4a3444f721bd2e2678f 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Factory\Tag\Package;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for network packages
@@ -48,21 +48,19 @@ class PackageTagsFactory extends ObjectFactory {
         */
        public static final function createPackageTagsInstance () {
                // Do we have an instance in the registry?
-               if (Registry::getRegistry()->instanceExists('package_tags')) {
+               if (GenericRegistry::getRegistry()->instanceExists('package_tags')) {
                        // Then use this instance
-                       $packageInstance = Registry::getRegistry()->getInstance('package_tags');
+                       $packageInstance = GenericRegistry::getRegistry()->getInstance('package_tags');
                } else {
                        // Now prepare the tags instance
                        $packageInstance = self::createObjectByConfiguredName('package_tags_class');
 
                        // Set the instance in registry for further use
-                       Registry::getRegistry()->addInstance('package_tags', $packageInstance);
+                       GenericRegistry::getRegistry()->addInstance('package_tags', $packageInstance);
                }
 
                // Return the instance
                return $packageInstance;
        }
-}
 
-// [EOF]
-?>
+}
index 9b9acc6153abf1175412d90b05aaefdeec5f65e9..caf683b8aabb2354798e1ad75e0b66f7c60fb466 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Filter\Node\BaseNodeFilter;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -67,7 +67,7 @@ class NodeActivationAnnouncementFilter extends BaseNodeFilter implements Filtera
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Prepare a self-test task for the listeners
                $taskInstance = ObjectFactory::createObjectByConfiguredName('node_announcement_task_class');
@@ -75,7 +75,5 @@ class NodeActivationAnnouncementFilter extends BaseNodeFilter implements Filtera
                // Register it
                $handlerInstance->registerTask('announcement', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index 6ed5105a0e35393f38e11624adc573e7f902c145..3b84a675a25b332301d23937617cab339989c509 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\AptProxy\Filter\Initialization;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -68,7 +68,7 @@ class AptProxyInitializationFilter extends BaseAptProxyFilter implements Filtera
                $proxyInstance = ObjectFactory::createObjectByConfiguredName('node_console_apt_proxy_class');
 
                // Get a registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Set the app instance
                $proxyInstance->setApplicationInstance($applicationInstance);
@@ -77,9 +77,7 @@ class AptProxyInitializationFilter extends BaseAptProxyFilter implements Filtera
                $proxyInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);
 
                // Set the apt_proxy instance in registry
-               Registry::getRegistry()->addInstance('apt_proxy', $proxyInstance);
+               GenericRegistry::getRegistry()->addInstance('apt_proxy', $proxyInstance);
        }
-}
 
-// [EOF]
-?>
+}
index 43b5dd8e0ec49a489b63229be056ec8971b69fcb..f3a83bd2c54a60784e636477f1218c0620e2d030 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\AptProxy\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -65,7 +65,7 @@ class AptProxyWelcomeTeaserFilter extends BaseAptProxyFilter implements Filterab
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Now output the teaser
                $proxyInstance->outputConsoleTeaser();
index 24d0ad15eb30769934cae258c6448c015e59115d..ec532494fbd7dbef4c2793faef47e0322465bcf0 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Filter\Bootstrap\AptProxy\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class AptProxyBootstrap???Filter extends BaseAptProxyFilter implements Filterabl
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get apt-proxy instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Now do something
                $this->partialStub('Please implement this step.');
        }
-}
 
-// [EOF]
-?>
+}
index c5ec099784a3b34c5c33ae2840c63eaf96bd6755..c6a577c136ba611972afb6fbb38c6834648ca3e7 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\AptProxy\Extra;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class AptProxyBootstrapExtraBootstrappingFilter extends BaseAptProxyFilter imple
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get apt-proxy instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Do some extra bootstrapping steps
                $proxyInstance->doBootstrapping();
index 1dabf9fadf7a544c3b6e82a2704991a5ce843dab..e2dc0cf78fe3e2163c8fd2d4742836271a0c0489 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\AptProxy\Activation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class AptProxyBootstrapGenericActivationFilter extends BaseAptProxyFilter implem
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a apt-proxy instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Set the flag
                $proxyInstance->enableIsActive();
@@ -72,7 +72,5 @@ class AptProxyBootstrapGenericActivationFilter extends BaseAptProxyFilter implem
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: apt-proxy has been activated.');
        }
-}
 
-// [EOF]
-?>
+}
index f86f5fcc4512af341d1cca82960066d57c3c725d..55e8d83b9572efbf6d28f017f6b15b5231680f5e 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Filter\Bootstrap\Chat\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class ChatBootstrap???Filter extends BaseChatFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get chat instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Now do something
                $this->partialStub('Please implement this step.');
        }
-}
 
-// [EOF]
-?>
+}
index 830bf1ad7d538947acf1d400897de70b9caf062e..bcde1a6cad1cfb44701d95ac959c9077116715ae 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Chat\Extra;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class ChatBootstrapExtraBootstrappingFilter extends BaseChatFilter implements Fi
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get chat instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Do some extra bootstrapping steps
                $chatInstance->doBootstrapping();
index 7b6d3334f750c5e2d7d2ab7a0a9615eb2251a62b..1291a2449fe9130baa6c248dbbf7aef659ab8e8d 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Chat\Activation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class ChatBootstrapGenericActivationFilter extends BaseChatFilter implements Fil
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a chat instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Set the flag
                $chatInstance->enableIsActive();
@@ -72,7 +72,5 @@ class ChatBootstrapGenericActivationFilter extends BaseChatFilter implements Fil
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: The chat console has been activated.');
        }
-}
 
-// [EOF]
-?>
+}
index 66bbd20c72ed7552908728e94cdb0fe034d55b41..9628d1ec6a78e22807ae98164bc8f62e124e4f44 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Filter\Bootstrap\Crawler\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class CrawlerBootstrap???Filter extends BaseCrawlerFilter implements Filterable
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Now do something
                $this->partialStub('Please implement this step.');
        }
-}
 
-// [EOF]
-?>
+}
index 10df8349e1052fe443c3e910c5e27a06fa0f285a..d11346608a15b8673e2a2ba1339c2e905d4afe89 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -67,7 +67,7 @@ class CrawlerBootstrapExtraBootstrappingFilter extends BaseCrawlerFilter impleme
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Do some extra bootstrapping steps
                $crawlerInstance->doBootstrapping();
index cd4931725561c3af58a0b7bf5695a6aeb1ee034f..78a2e667f1606d4ee86cd5e70cedec95ca91854b 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -67,7 +67,7 @@ class CrawlerBootstrapGenericActivationFilter extends BaseCrawlerFilter implemen
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Set the flag
                $crawlerInstance->enableIsActive();
@@ -75,7 +75,5 @@ class CrawlerBootstrapGenericActivationFilter extends BaseCrawlerFilter implemen
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: The crawler has been activated.');
        }
-}
 
-// [EOF]
-?>
+}
index db245f5aeaa67aefd35a15c73e71aa0aaab5aab1..219138c2c1546ddde05d01b8a2dae93dc91a84da 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Filter\Bootstrap\Cruncher\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class CruncherBootstrap???Filter extends BaseCruncherFilter implements Filterabl
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get cruncher instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Now do something
                $this->partialStub('Please implement this step.');
        }
-}
 
-// [EOF]
-?>
+}
index 8fab686a3dd23d1241567a95106b3ed5a0e5357e..e7c2ee61b4294b4f345a1acea2769f107e2ed450 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Cruncher\Queue;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class CruncherBootstrapBufferQueueInitializerFilter extends BaseCruncherFilter i
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get cruncher instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Init all buffer queues
                $cruncherInstance->initBufferQueues();
        }
-}
 
-// [EOF]
-?>
+}
index 3714e7e46a274d5af711117b18056a44add07105..b07adb21ba37d50c844ae30fcbb26e1cb138f440 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Cruncher\Extra;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class CruncherBootstrapExtraBootstrappingFilter extends BaseCruncherFilter imple
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get cruncher instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Do some extra bootstrapping steps
                $cruncherInstance->doBootstrapping();
index 24dc31979cec8deee09632d3dd96f23c2a09f4f4..7b1a176815b837d51203bc0a07f33f0e1ffd02d2 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Cruncher\Activation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class CruncherBootstrapGenericActivationFilter extends BaseCruncherFilter implem
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a cruncher instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Set the flag
                $cruncherInstance->enableIsActive();
@@ -72,7 +72,5 @@ class CruncherBootstrapGenericActivationFilter extends BaseCruncherFilter implem
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: The cruncher has been activated.');
        }
-}
 
-// [EOF]
-?>
+}
index c321091c074c9f553af16c241fe2bed9aaffbc4e..b5d63fe532cb4549b08a17cf107138ae2895b52f 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Mxchange\Hub\Filter\Bootstrap\Miner\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class MinerBootstrap???Filter extends BaseMinerFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Now do something
                $this->partialStub('Please implement this step.');
        }
-}
 
-// [EOF]
-?>
+}
index 86ed47a030abc5a58f09c2ac2fb790aaf1053f0f..ccb40cfa2be3099bf5eb3febc7f441a96545d717 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Queue;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,12 +64,10 @@ class MinerBootstrapBufferQueueInitializerFilter extends BaseMinerFilter impleme
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Init all buffer queues
                $minerInstance->initBufferQueues();
        }
-}
 
-// [EOF]
-?>
+}
index a25be4ea13f1e9d35c65b380e111fd750e8dfcf9..2d00a9b6806d18d7af26ec31b32e26f0f1375e14 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Extra;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class MinerBootstrapExtraBootstrappingFilter extends BaseMinerFilter implements
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Do some extra bootstrapping steps
                $minerInstance->doBootstrapping();
index 60288d8e6f2fe488a056ad146f1f5036b4910f03..935a06a8bf3dbc552125556c50d589cc793fd2b8 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Activation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -64,7 +64,7 @@ class MinerBootstrapGenericActivationFilter extends BaseMinerFilter implements F
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Set the flag
                $minerInstance->enableIsActive();
@@ -72,7 +72,5 @@ class MinerBootstrapGenericActivationFilter extends BaseMinerFilter implements F
                // Debug message
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: The miner has been activated.');
        }
-}
 
-// [EOF]
-?>
+}
index 7960f588eb6c365075568b2bc5923db506d3406a..b72b70d984117678367e38d121a1fa3868aec115 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Chat\Filter\Initialization;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -68,7 +68,7 @@ class ChatInitializationFilter extends BaseChatFilter implements Filterable {
                $chatInstance = ObjectFactory::createObjectByConfiguredName('node_console_chat_class');
 
                // Get a registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Set the app instance
                $chatInstance->setApplicationInstance($applicationInstance);
@@ -77,9 +77,7 @@ class ChatInitializationFilter extends BaseChatFilter implements Filterable {
                $chatInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);
 
                // Set the chat instance in registry
-               Registry::getRegistry()->addInstance('chat', $chatInstance);
+               GenericRegistry::getRegistry()->addInstance('chat', $chatInstance);
        }
-}
 
-// [EOF]
-?>
+}
index db95df5629ff2e416ebaf372e82ce6d2e0d21ade..ee4ca4af1d03aabe1ffe058543dab4b834f8fb7f 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Chat\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -65,7 +65,7 @@ class ChatWelcomeTeaserFilter extends BaseChatFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Now output the teaser
                $chatInstance->outputConsoleTeaser();
index dc1acf8e31c3116c4d3d627358c0e9fe7b7f289c..e584121be5cbda7715713adecbf61a59a58236ec 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -71,7 +71,7 @@ class CrawlerInitializationFilter extends BaseCrawlerFilter implements Filterabl
                $crawlerInstance = ObjectFactory::createObjectByConfiguredName('node_console_crawler_class');
 
                // Get a registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Set the app instance
                $crawlerInstance->setApplicationInstance($applicationInstance);
@@ -79,7 +79,5 @@ class CrawlerInitializationFilter extends BaseCrawlerFilter implements Filterabl
                // Add crawler-specific filters
                $crawlerInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);
        }
-}
 
-// [EOF]
-?>
+}
index 3e5f7db14a2e4fcd86a1c609ee12420b62f47f66..3c42ba4e316c8d5b132bd5526003de8fcf742d19 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -68,7 +68,7 @@ class CrawlerWelcomeTeaserFilter extends BaseCrawlerFilter implements Filterable
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Now output the teaser
                $crawlerInstance->outputConsoleTeaser();
index bdc465470a8fa42ef272753461c24fd34f4c4348..0cb44b879e991fded3ba5fc6a4dc7da6acdbb310 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Cruncher\Filter\Initialization;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -85,7 +85,7 @@ class CruncherInitializationFilter extends BaseCruncherFilter implements Filtera
                        $cruncherInstance = ObjectFactory::createObjectByName($className);
 
                        // Get a registry
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                        // Set the app instance
                        $cruncherInstance->setApplicationInstance($applicationInstance);
index dc1b7da89e00c377b314c75afe2eda083c1ec46e..92b37c3d05b4796d9e3d7c3ee3824a42de7b5663 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Cruncher\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -65,7 +65,7 @@ class CruncherWelcomeTeaserFilter extends BaseCruncherFilter implements Filterab
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Now output the teaser
                $cruncherInstance->outputConsoleTeaser();
index 44d5dbf88116e06a23de9c4850dd071e4246c06e..8d468e5ffb87f15cd25943b01514ed919ef59201 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Miner\Filter\Initialization;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -85,7 +85,7 @@ class MinerInitializationFilter extends BaseMinerFilter implements Filterable {
                        $minerInstance = ObjectFactory::createObjectByName($className);
 
                        // Get a registry
-                       $applicationInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                        // Set the app instance
                        $minerInstance->setApplicationInstance($applicationInstance);
index ee9b164ffe1c5eb32c9d6076a27344e50032f0db..c287e5b6558a426d82cdc2b34f015fe5017ce74f 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Miner\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -65,12 +65,10 @@ class MinerWelcomeTeaserFilter extends BaseMinerFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Now output the teaser
                $minerInstance->outputConsoleTeaser();
        }
-}
 
-// [EOF]
-?>
+}
index ed0df03bccc37d753e58aad142ebab993a2eab57..cc5cff48bfb22d3b0ea111d3110fe75fcc88978c 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Shutdown\AptProxy;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,7 +66,7 @@ class AptProxyShutdownFilter extends BaseAptProxyFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $proxyInstance = Registry::getRegistry()->getInstance('apt_proxy');
+               $proxyInstance = GenericRegistry::getRegistry()->getInstance('apt_proxy');
 
                // Shutdown the apt-proxy. This should be the last line
                $proxyInstance->doShutdown();
index 5feb6e5e15a79172b083a80c3080fa18590ae761..6cc83f4050e5e55ff135e2929cfec56573f36d20 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Shutdown\Chat;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,7 +66,7 @@ class ChatShutdownFilter extends BaseChatFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $chatInstance = Registry::getRegistry()->getInstance('chat');
+               $chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Shutdown the chat. This should be the last line
                $chatInstance->doShutdown();
index e198c68e244abdede5801785326d49fb9627bfac..36e0cc49df7384a8ad49b71249478271d6b458e6 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -69,7 +69,7 @@ class CrawlerShutdownFilter extends BaseCrawlerFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Shutdown the crawler. This should be the last line
                $crawlerInstance->doShutdown();
index bdecf7262eca6812067c9952e9a8051cbc368aa8..f101349c3149c9c674fb64d930f3f41a91619a79 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Shutdown\Cruncher;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,7 +66,7 @@ class CruncherShutdownFilter extends BaseCruncherFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               $cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Shutdown the cruncher. This should be the last line
                $cruncherInstance->doShutdown();
index 1a64a469eea31237e459441d2dac899fe11d49b8..5499c63b659b2037bb45f080ee2cd800ee9dc1cf 100644 (file)
@@ -4,7 +4,7 @@ namespace Org\Shipsimu\Hub\Filter\Shutdown\Miner;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,7 +66,7 @@ class MinerShutdownFilter extends BaseMinerFilter implements Filterable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Shutdown the miner. This should be the last line
                $minerInstance->doShutdown();
index 4c06c24a436af1805a389c5880947e867510e0f5..936e7ed9c74722a03cdbad81cc4ecb38d416637f 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Filter\Node\BaseNodeFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -68,7 +68,7 @@ class NodeShutdownTaskHandlerFilter extends BaseNodeFilter implements Filterable
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get task handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Shutdown the task manager and all its registered tasks
                $handlerInstance->doShutdown();
index ab2c61bc018ecdd51271fcb458e12ff857004a79..4e94682c048c857edb3c4d99bee764548c4dacc1 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Filter\Initializer\AptProxy\Handler\Task;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,13 +66,13 @@ class AptProxyTaskHandlerInitializerFilter extends BaseAptProxyFilter implements
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get apt-proxy instance
-               //$chatInstance = Registry::getRegistry()->getInstance('chat');
+               //$chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                /*
                 * Register all tasks:
@@ -82,7 +82,5 @@ class AptProxyTaskHandlerInitializerFilter extends BaseAptProxyFilter implements
                $taskInstance = ObjectFactory::createObjectByConfiguredName('apt_proxy_listener_task_class');
                $handlerInstance->registerTask('apt_proxy_listener', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index ac8d092a4e43546457ad7f9f8eeab21cb95d6ebe..b4ba8482d6500c58f499ca810417d20daa11ef5a 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Filter\Initializer\Chat\Handler\Task;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,13 +66,13 @@ class ChatTaskHandlerInitializerFilter extends BaseChatFilter implements Filtera
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get chat instance
-               //$chatInstance = Registry::getRegistry()->getInstance('chat');
+               //$chatInstance = GenericRegistry::getRegistry()->getInstance('chat');
 
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                /*
                 * Register all tasks:
@@ -82,7 +82,5 @@ class ChatTaskHandlerInitializerFilter extends BaseChatFilter implements Filtera
                $taskInstance = ObjectFactory::createObjectByConfiguredName('chat_telnet_listener_task_class');
                $handlerInstance->registerTask('chat_telnet_listener', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index 4ee24df93f3b2504ce9f4aa198e89d94cfe4a3ed..59b92509c073119c135aea2ff6e511fb125175f8 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Crawler\Filter\BaseCrawlerFilter;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -69,13 +69,13 @@ class CrawlerTaskHandlerInitializerFilter extends BaseCrawlerFilter implements F
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get crawler instance
-               $crawlerInstance = Registry::getRegistry()->getInstance('crawler');
+               $crawlerInstance = GenericRegistry::getRegistry()->getInstance('crawler');
 
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                /*
                 * Register all tasks:
@@ -130,7 +130,5 @@ class CrawlerTaskHandlerInitializerFilter extends BaseCrawlerFilter implements F
                $taskInstance = ObjectFactory::createObjectByConfiguredName('crawler_uploaded_list_scanner_task_class');
                $handlerInstance->registerTask('crawler_uploaded_list_scanner', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index a0512affe70e987493c469a40835f9f7df3e955a..eb7ad1fce0a0bc2370615febc83858b1819f0a02 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Filter\Initializer\Cruncher\Handler\Task;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,13 +66,13 @@ class CruncherTaskHandlerInitializerFilter extends BaseCruncherFilter implements
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get cruncher instance
-               //$cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+               //$cruncherInstance = GenericRegistry::getRegistry()->getInstance('cruncher');
 
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                // Register all tasks:
                //
@@ -96,7 +96,5 @@ class CruncherTaskHandlerInitializerFilter extends BaseCruncherFilter implements
                $taskInstance = ObjectFactory::createObjectByConfiguredName('cruncher_key_producer_task_class');
                $handlerInstance->registerTask('cruncher_key_producer', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index bee3110b0d8deceb27c580021f7ca4113b5029a4..6eec697ac95f77e9f9bdb24441731a572be4faa6 100644 (file)
@@ -5,7 +5,7 @@ namespace Org\Shipsimu\Hub\Filter\Initializer\Miner\Handler\Task;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -66,13 +66,13 @@ class MinerTaskHandlerInitializerFilter extends BaseMinerFilter implements Filte
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get miner instance
-               //$minerInstance = Registry::getRegistry()->getInstance('miner');
+               //$minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                // Register all tasks:
                //
@@ -103,7 +103,5 @@ class MinerTaskHandlerInitializerFilter extends BaseMinerFilter implements Filte
                $taskInstance = ObjectFactory::createObjectByConfiguredName('miner_node_communicator_task_class');
                $handlerInstance->registerTask('miner_node_communicator', $taskInstance);
        }
-}
 
-// [EOF]
-?>
+}
index 49f296c275d703103bbc84296b562f88544006ca..2f1fa0dbfe504dc27a75b7c4167792551d7e710e 100644 (file)
@@ -9,7 +9,7 @@ use Org\Shipsimu\Hub\Filter\Node\BaseNodeFilter;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -76,7 +76,7 @@ class NodeTaskHandlerInitializerFilter extends BaseNodeFilter implements Filtera
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
                // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+               GenericRegistry::getRegistry()->addInstance('task_handler', $handlerInstance);
 
                // Prepare a package-tags initialization task for the listeners
                $taskInstance = ObjectFactory::createObjectByConfiguredName('node_package_tags_init_task_class');
index ad068657684296d9849de77b7f3e5e07c0fe5de9..a322a98410bf5a5a5e948ad938cdae71b3e5d6e3 100644 (file)
@@ -10,8 +10,8 @@ use Org\Shipsimu\Hub\Network\Receive\Receivable;
 use Org\Shipsimu\Hub\Node\BaseHubNode;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A AnnouncementAnswerOkay handler
@@ -84,7 +84,7 @@ class NodeAnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implement
                DhtObjectFactory::createDhtInstance('node')->registerNodeByMessageData($messageData, $this, TRUE);
 
                // Get handler instance
-               $handlerInstance = Registry::getRegistry()->getInstance('task_handler');
+               $handlerInstance = GenericRegistry::getRegistry()->getInstance('task_handler');
 
                // Generate DHT bootstrap task
                $taskInstance = ObjectFactory::createObjectByConfiguredName('node_dht_late_bootstrap_task_class');
@@ -142,7 +142,5 @@ class NodeAnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implement
                // Remove temporay configuration
                $this->getConfigInstance()->unsetConfigEntry(NodeDistributedHashTableDatabaseWrapper::DB_COLUMN_ACCEPTED_OBJECTS);
        }
-}
 
-// [EOF]
-?>
+}
index ec8ea7e9f150950d1d69cf6c66d1c1d60976756b..461624eef0d58894dcb0c58815abc220f4fc42c6 100644 (file)
@@ -13,7 +13,7 @@ use Org\Shipsimu\Hub\Network\Package\NetworkPackage;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
 use Org\Mxchange\CoreFramework\Visitor\Visitor;
@@ -95,7 +95,7 @@ abstract class BaseConnectionHelper extends BaseHubSystemHelper implements Visit
                $this->setPackageInstance($packageInstance);
 
                // Register this connection helper
-               Registry::getRegistry()->addInstance('connection', $this);
+               GenericRegistry::getRegistry()->addInstance('connection', $this);
 
                // Get the fragmenter instance
                $fragmenterInstance = FragmenterFactory::createFragmenterInstance('package');
index 32cacec425f430323e1d7ecea9e80904a461bbb6..d6b92bf530c8435b53aee2343f28f87c31fd3c98 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A general hub miner class
@@ -89,7 +89,7 @@ abstract class BaseHubMiner extends BaseHubSystem implements Updateable {
         */
        private function initMiner () {
                // Add own instance to registry
-               Registry::getRegistry()->addInstance('miner', $this);
+               GenericRegistry::getRegistry()->addInstance('miner', $this);
 
                // Init the state
                MinerStateFactory::createMinerStateInstanceByName('init');
index 54232ea84a2a876233b7e99cf3e6c640f37083ea..ebfad64e8b7fbcf189abf46628dbc3e7752fdd0c 100644 (file)
@@ -10,7 +10,7 @@ use Org\Shipsimu\Hub\Node\Node;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
@@ -119,7 +119,7 @@ class HubBootNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();
index 22a0af3954a42b35c7c346281e50e602b751c256..7757175a0277289f9fa0df6a1296091c30294d8c 100644 (file)
@@ -24,7 +24,7 @@ use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\Task\Taskable;
@@ -115,7 +115,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
                $this->setCryptoInstance($cryptoInstance);
 
                // Set the node instance in registry
-               Registry::getRegistry()->addInstance('node', $this);
+               GenericRegistry::getRegistry()->addInstance('node', $this);
 
                // Init state which sets the state to 'init'
                $this->initState();
@@ -543,7 +543,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
                } // END - if
 
                // Get the controller here
-               $controllerInstance = Registry::getRegistry()->getInstance('controller');
+               $controllerInstance = GenericRegistry::getRegistry()->getInstance('controller');
 
                // Run all filters for the hub activation
                $controllerInstance->executeActivationFilters($requestInstance, $responseInstance);
index 6ecdcdbfab23cd5e776af82b566e5cd2a2bf7312..771d08bf4c7ab1879e8ec32e2d4e6cb146d9c5e0 100644 (file)
@@ -9,7 +9,7 @@ use Org\Shipsimu\Hub\Node\Node;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
@@ -78,7 +78,7 @@ class HubListNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();
@@ -100,7 +100,5 @@ class HubListNode extends BaseHubNode implements Node, Registerable {
        public function addExtraTasks (HandleableTask $handlerInstance) {
                $this->partialStub('Please add some tasks or empty this method.');
        }
-}
 
-// [EOF]
-?>
+}
index 41039aa2a05de8daf894e0d766e6b7f8912f71cc..f9f57b0db258e0776bf76992e4a1807e26b96899 100644 (file)
@@ -9,7 +9,7 @@ use Org\Shipsimu\Hub\Node\Node;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
@@ -81,7 +81,7 @@ class HubMasterNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();
@@ -103,7 +103,5 @@ class HubMasterNode extends BaseHubNode implements Node, Registerable {
        public function addExtraTasks (HandleableTask $handlerInstance) {
                $this->partialStub('Please add some tasks or empty this method.');
        }
-}
 
-// [EOF]
-?>
+}
index ad0b6eeb68821e1c60b34373320246483ead3d8c..d4e9e9147f5e4edd68dc71fe4bc42c1861f9e0dc 100644 (file)
@@ -9,7 +9,7 @@ use Org\Shipsimu\Hub\Node\Node;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
@@ -78,7 +78,7 @@ class HubRegularNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();
@@ -100,7 +100,5 @@ class HubRegularNode extends BaseHubNode implements Node, Registerable {
        public function addExtraTasks (HandleableTask $handlerInstance) {
                $this->partialStub('Please add some tasks or empty this method.');
        }
-}
 
-// [EOF]
-?>
+}
index 66b8fb22e346fba13541898a2f9c50361e612685..c4ac7d04b960bd543baf168cc53e53af0209b786 100644 (file)
@@ -30,7 +30,7 @@ use Org\Mxchange\CoreFramework\Compressor\Compressor;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Factory\Registry\Socket\SocketRegistryFactory;
 use Org\Mxchange\CoreFramework\Feature\FrameworkFeature;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Socket\InvalidSocketException;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
@@ -640,7 +640,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE: Reached line ' . __LINE__ . ' after discoverSocket() has been called.');
 
                // Get the connection helper from registry
-               $helperInstance = Registry::getRegistry()->getInstance('connection');
+               $helperInstance = GenericRegistry::getRegistry()->getInstance('connection');
 
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('NETWORK-PACKAGE: stateInstance=' . $helperInstance->getStateInstance());
index e666d6a820a2ac359dedd65852f61a25ac43fb6c..d83040ce92385c0c5c167f15449b6dbd4d04b53d 100644 (file)
@@ -8,7 +8,7 @@ use Org\Shipsimu\Hub\Pool\Poolable;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
 use Org\Mxchange\CoreFramework\Visitor\Visitor;
 
@@ -132,15 +132,15 @@ abstract class BasePool extends BaseHubSystem implements Poolable, Visitable {
                $visitorInstance->visitPool($this);
 
                // Do we have a registry instance for this visitor's iterator?
-               if (Registry::getRegistry()->instanceExists($visitorInstance->getVisitorMode() . '_pool_iterator')) {
+               if (GenericRegistry::getRegistry()->instanceExists($visitorInstance->getVisitorMode() . '_pool_iterator')) {
                        // Get the instance from registry
-                       $iteratorInstance = Registry::getRegistry()->getInstance($visitorInstance->getVisitorMode() . '_pool_iterator');
+                       $iteratorInstance = GenericRegistry::getRegistry()->getInstance($visitorInstance->getVisitorMode() . '_pool_iterator');
                } else {
                        // Get a new iterator instance
                        $iteratorInstance = ObjectFactory::createObjectByConfiguredName($visitorInstance->getVisitorMode() . '_pool_iterator_class', array($this->getPoolEntriesInstance()));
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($visitorInstance->getVisitorMode() . '_pool_iterator', $iteratorInstance);
+                       GenericRegistry::getRegistry()->addInstance($visitorInstance->getVisitorMode() . '_pool_iterator', $iteratorInstance);
                }
 
                // Is it valid?
index 5f0783fb3a4b60e95ab444544733166e57ac1cf6..02887dd4a1a0a91fd780d8486cf351c2855d40e7 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A general Producer class
@@ -66,7 +66,7 @@ abstract class BaseProducer extends BaseHubSystem {
                $this->initProducer();
 
                // Get miner instance
-               $minerInstance = Registry::getRegistry()->getInstance('miner');
+               $minerInstance = GenericRegistry::getRegistry()->getInstance('miner');
 
                // Change state to next state
                $minerInstance->blockProducerHasInitialized($this);
index 03d026cc19147a05d0d922545fbe27229a8ce658..ca6a40440627a19e411c24aa07c4fd3e35721aa7 100644 (file)
@@ -13,7 +13,7 @@ use Org\Shipsimu\Hub\Template\Engine\Xml\ObjectRegistry\XmlObjectRegistryTemplat
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\Template\XmlTemplateEngineFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A Package tags class
@@ -88,7 +88,7 @@ class PackageTags extends BaseTag implements Tagable {
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('TAGS: Initializing object registry - CALLED!');
 
                // Get the application instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Get a XML template instance
                $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_object_registry_template_class');
index c9466c45e04a785b2e251ba9d1279eba8ebc56a4..14abf79d07d7097b0de87235759d0ff58bd0c59f 100644 (file)
@@ -6,7 +6,7 @@ namespace Org\Shipsimu\Hub\Crawler\Task\Communicator\Node;
 use Org\Shipsimu\Hub\Factory\Communicator\CommunicatorFactory;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
@@ -80,7 +80,7 @@ class CrawlerNodeCommunicatorTask extends BaseTask implements Taskable, Visitabl
                $communicatorInstance = CommunicatorFactory::createCommunicatorInstance('crawler_node_communicator_class', 'node');
 
                // Get the current crawler state from registry
-               $stateInstance = Registry::getRegistry()->getInstance('crawler')->getStateInstance();
+               $stateInstance = GenericRegistry::getRegistry()->getInstance('crawler')->getStateInstance();
 
                // Debug message
                /* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-NODE-COMMUNICATOR-TASK: Executing stateInstance=' . $stateInstance->__toString());
@@ -98,7 +98,5 @@ class CrawlerNodeCommunicatorTask extends BaseTask implements Taskable, Visitabl
        public function doShutdown () {
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-NODE-COMMUNICATOR-TASK: Shutting down...');
        }
-}
 
-// [EOF]
-?>
+}
index 8132033d8e4b303b9f0e820926c82d00efe86545..3fd2c4ac17c908faf19180dfc97c4a96a897d23c 100644 (file)
@@ -75,7 +75,7 @@ class CruncherKeyProducerTask extends BaseTask implements Taskable, Visitable {
                $producerInstance = ProducerFactory::createProducerInstance('cruncher_key_producer_class', 'key');
 
                // Get the current cruncher state from registry
-               $stateInstance = Registry::getRegistry()->getInstance('cruncher')->getStateInstance();
+               $stateInstance = GenericRegistry::getRegistry()->getInstance('cruncher')->getStateInstance();
 
                // Debug message
                /* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRUNCHER-KEY-PRODUCER-TASK: Executing stateInstance=' . $stateInstance->__toString());
index b6ac893b620011ab0b657a93c2d1e7587f0c0ca2..0479743ba7e45eabf0cb47937fa89d59d0917630 100644 (file)
@@ -75,7 +75,7 @@ class CruncherTestUnitProducerTask extends BaseTask implements Taskable, Visitab
                $producerInstance = ProducerFactory::createProducerInstance('cruncher_test_unit_producer_class', 'test_unit');
 
                // Get the current cruncher state from registry
-               $stateInstance = Registry::getRegistry()->getInstance('cruncher')->getStateInstance();
+               $stateInstance = GenericRegistry::getRegistry()->getInstance('cruncher')->getStateInstance();
 
                // Debug message
                /* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRUNCHER-TEST-UNIT-PRODUCER-TASK: Executing stateInstance=' . $stateInstance->__toString());
index eb6c4630834a885f94a7a7c4c9c703e159482438..96567726c554b06f18776418d39613b3d2cdfc7f 100644 (file)
@@ -3,7 +3,7 @@
 namespace Org\Shipsimu\Hub\Cruncher\Task\Fetcher\WorkUnit;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
@@ -82,7 +82,7 @@ class CruncherWorkUnitFetcherTask extends BaseTask implements Taskable, Visitabl
                 *
                 * Please report any bugs you encounter to me.
                 */
-               Registry::getRegistry()->getInstance('cruncher')->doFetchWorkUnits();
+               GenericRegistry::getRegistry()->getInstance('cruncher')->doFetchWorkUnits();
        }
 
        /**
index 24bd321428f0b535c03760568a4ce2b82b8a22df..64a071d3b23773c19bc61197f78b346f1d114ec0 100644 (file)
@@ -3,7 +3,7 @@
 namespace Org\Shipsimu\Hub\Miner\Task\Fetcher\Block;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
@@ -82,7 +82,7 @@ class MinerBlockFetcherTask extends BaseTask implements Taskable, Visitable {
                 *
                 * Please report any bugs you encounter to me.
                 */
-               Registry::getRegistry()->getInstance('miner')->doSearchForBlocks();
+               GenericRegistry::getRegistry()->getInstance('miner')->doSearchForBlocks();
        }
 
        /**
index 78ae40a8b9ec4c2cce1e09e3a6883f0ccb7ce346..74353fae757effdda87c7e619ed2f47fbd42d3fa 100644 (file)
@@ -3,7 +3,7 @@
 namespace Org\Shipsimu\Hub\Miner\Task\Producer\GenesisBlock;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
@@ -76,7 +76,7 @@ class MinerRealGenesisBlockProducerTask extends BaseTask implements Taskable, Vi
                $producerInstance = ProducerFactory::createProducerInstance('miner_real_genesis_block_producer_class', 'real_unit');
 
                // Get the current miner state from registry
-               $stateInstance = Registry::getRegistry()->getInstance('miner')->getStateInstance();
+               $stateInstance = GenericRegistry::getRegistry()->getInstance('miner')->getStateInstance();
 
                // Debug message
                /* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MINER-GENESIS-BLOCK-PRODUCER-TASK: Executing stateInstance=' . $stateInstance->__toString());
index ae2e0be06d1bebf169438b3b969c3db056942af0..1c4a34405bfd186778a45addd0299c40f38caf8d 100644 (file)
@@ -75,7 +75,7 @@ class MinerTestGenesisBlockProducerTask extends BaseTask implements Taskable, Vi
                $producerInstance = ProducerFactory::createProducerInstance('miner_test_genesis_block_producer_class', 'test_unit');
 
                // Get the current miner state from registry
-               $stateInstance = Registry::getRegistry()->getInstance('miner')->getStateInstance();
+               $stateInstance = GenericRegistry::getRegistry()->getInstance('miner')->getStateInstance();
 
                // Debug message
                /* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MINER-TEST-GENESIS-BLOCK-PRODUCER-TASK: Executing stateInstance=' . $stateInstance->__toString());
index 37097c05b885865854f3ac28bb960bff1fec0f06..e98a4954cc0269857040afb600c478273fac9e87 100644 (file)
@@ -6,7 +6,7 @@ namespace Org\Shipsimu\Hub\Template\Engine\Xml;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Factory\Template\XmlTemplateEngineFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
 /**
@@ -98,7 +98,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine {
                $this->typePrefix      = $typePrefix;
 
                // Get template instance
-               $applicationInstance = Registry::getRegistry()->getInstance('app');
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Determine base path
                $templateBasePath = $this->getConfigInstance()->getConfigEntry('application_base_path') . FrameworkBootstrap::getRequestInstance()->getRequestElement('app') . '/';
index dd696adbe6f2098e0f628d751e5f0bb859e7ae97..e209cde44eefba63d8a50a7c25018772d0b0e402 100644 (file)
@@ -7,7 +7,7 @@ use Org\Shipsimu\Hub\Factory\Registry\Object\ObjectTypeRegistryFactory;
 use Org\Shipsimu\Hub\Template\Engine\Xml\BaseXmlTemplateEngine;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
diff --git a/core b/core
index de0eb5a71c8f65df71712ba9c5cd7092baa8d980..bed81d8edc3673951a1ee57f38f5a1a07c417b69 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit de0eb5a71c8f65df71712ba9c5cd7092baa8d980
+Subproject commit bed81d8edc3673951a1ee57f38f5a1a07c417b69