From 2d75d9217739789fe29d204738e4f32f1850ba08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 20 Jan 2018 19:45:29 +0100 Subject: [PATCH] Continued: - Registry was renamed to GenericRegistry MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/hub/class_ApplicationHelper.php | 2 +- .../console/class_HubConsoleAptProxyCommand.php | 8 ++++---- .../console/class_HubConsoleChatCommand.php | 8 ++++---- .../console/class_HubConsoleCrawlerCommand.php | 8 ++++---- .../console/class_HubConsoleCruncherCommand.php | 8 ++++---- .../console/class_HubConsoleMainCommand.php | 6 +++--- .../console/class_HubConsoleMinerCommand.php | 8 ++++---- .../hub/classes/crawler/class_BaseNodeCrawler.php | 4 ++-- .../hub/classes/cruncher/class_BaseHubCruncher.php | 4 ++-- .../socket/class_PackageSocketDiscovery.php | 4 ++-- .../chain/class_PackageFilterChainFactory.php | 14 ++++++-------- .../factories/chunks/class_ChunkHandlerFactory.php | 12 +++++------- application/hub/classes/factories/class_ | 8 ++++---- .../factories/client/class_ClientFactory.php | 8 ++++---- .../communicator/class_CommunicatorFactory.php | 12 +++++------- .../factories/decoder/class_DecoderFactory.php | 8 ++++---- .../factories/dht/class_DhtObjectFactory.php | 12 +++++------- .../discovery/class_PackageDiscoveryFactory.php | 12 +++++------- .../discovery/class_SocketDiscoveryFactory.php | 8 ++++---- .../handler/class_MessageTypeHandlerFactory.php | 12 +++++------- .../handler/class_ProtocolHandlerFactory.php | 8 ++++---- .../factories/info/class_ConnectionInfoFactory.php | 8 ++++---- .../factories/lists/class_RecipientListFactory.php | 12 +++++------- .../locator/class_UniversalNodeLocatorFactory.php | 8 ++++---- .../factories/node/class_NodeObjectFactory.php | 10 +++++----- .../assembler/class_PackageAssemblerFactory.php | 12 +++++------- .../package/class_NetworkPackageFactory.php | 8 ++++---- .../package/fragmenter/class_FragmenterFactory.php | 12 +++++------- .../factories/producer/class_ProducerFactory.php | 12 +++++------- .../registry/class_ObjectTypeRegistryFactory.php | 12 +++++------- .../resolver/class_ProtocolResolverFactory.php | 8 ++++---- .../scanner/class_ScannerObjectFactory.php | 10 +++++----- .../factories/socket/class_SocketFactory.php | 14 +++++++------- .../source/units/class_UnitSourceFactory.php | 12 +++++------- .../source/url/class_UrlSourceObjectFactory.php | 10 +++++----- .../states/crawler/class_CrawlerStateFactory.php | 4 ++-- .../states/cruncher/class_CruncherStateFactory.php | 4 ++-- .../states/miner/class_MinerStateFactory.php | 4 ++-- .../factories/tags/class_PackageTagsFactory.php | 12 +++++------- .../class_NodeActivationAnnouncementFilter.php | 8 +++----- .../class_AptProxyInitializationFilter.php | 10 ++++------ .../class_AptProxyWelcomeTeaserFilter.php | 4 ++-- .../bootstrap/apt-proxy/class_AptProxyBootstrap | 8 +++----- ...s_AptProxyBootstrapExtraBootstrappingFilter.php | 4 ++-- ...ss_AptProxyBootstrapGenericActivationFilter.php | 8 +++----- .../filter/bootstrap/chat/class_ChatBootstrap | 8 +++----- ...class_ChatBootstrapExtraBootstrappingFilter.php | 4 ++-- .../class_ChatBootstrapGenericActivationFilter.php | 8 +++----- .../bootstrap/crawler/class_CrawlerBootstrap | 8 +++----- ...ss_CrawlerBootstrapExtraBootstrappingFilter.php | 4 ++-- ...ass_CrawlerBootstrapGenericActivationFilter.php | 8 +++----- .../bootstrap/cruncher/class_CruncherBootstrap | 8 +++----- ...uncherBootstrapBufferQueueInitializerFilter.php | 8 +++----- ...s_CruncherBootstrapExtraBootstrappingFilter.php | 4 ++-- ...ss_CruncherBootstrapGenericActivationFilter.php | 8 +++----- .../filter/bootstrap/miner/class_MinerBootstrap | 8 +++----- ..._MinerBootstrapBufferQueueInitializerFilter.php | 8 +++----- ...lass_MinerBootstrapExtraBootstrappingFilter.php | 4 ++-- ...class_MinerBootstrapGenericActivationFilter.php | 8 +++----- .../filter/chat/class_ChatInitializationFilter.php | 10 ++++------ .../filter/chat/class_ChatWelcomeTeaserFilter.php | 4 ++-- .../crawler/class_CrawlerInitializationFilter.php | 8 +++----- .../crawler/class_CrawlerWelcomeTeaserFilter.php | 4 ++-- .../class_CruncherInitializationFilter.php | 4 ++-- .../cruncher/class_CruncherWelcomeTeaserFilter.php | 4 ++-- .../miner/class_MinerInitializationFilter.php | 4 ++-- .../miner/class_MinerWelcomeTeaserFilter.php | 8 +++----- .../apt-proxy/class_AptProxyShutdownFilter.php | 4 ++-- .../shutdown/chat/class_ChatShutdownFilter.php | 4 ++-- .../crawler/class_CrawlerShutdownFilter.php | 4 ++-- .../cruncher/class_CruncherShutdownFilter.php | 4 ++-- .../shutdown/miner/class_MinerShutdownFilter.php | 4 ++-- .../node/class_NodeShutdownTaskHandlerFilter.php | 4 ++-- .../class_AptProxyTaskHandlerInitializerFilter.php | 10 ++++------ .../class_ChatTaskHandlerInitializerFilter.php | 10 ++++------ .../class_CrawlerTaskHandlerInitializerFilter.php | 10 ++++------ .../class_CruncherTaskHandlerInitializerFilter.php | 10 ++++------ .../class_MinerTaskHandlerInitializerFilter.php | 10 ++++------ .../class_NodeTaskHandlerInitializerFilter.php | 4 ++-- .../class_NodeAnnouncementAnswerOkayHandler.php | 8 +++----- .../connection/class_BaseConnectionHelper.php | 4 ++-- .../hub/classes/miner/class_BaseHubMiner.php | 4 ++-- .../hub/classes/nodes/boot/class_HubBootNode.php | 4 ++-- .../hub/classes/nodes/class_BaseHubNode.php | 6 +++--- .../hub/classes/nodes/list/class_HubListNode.php | 8 +++----- .../classes/nodes/master/class_HubMasterNode.php | 8 +++----- .../classes/nodes/regular/class_HubRegularNode.php | 8 +++----- .../hub/classes/package/class_NetworkPackage.php | 4 ++-- application/hub/classes/pools/class_BasePool.php | 8 ++++---- .../hub/classes/producer/class_BaseProducer.php | 4 ++-- .../hub/classes/tags/package/class_PackageTags.php | 4 ++-- .../class_CrawlerNodeCommunicatorTask.php | 8 +++----- .../cruncher/class_CruncherKeyProducerTask.php | 2 +- .../class_CruncherTestUnitProducerTask.php | 2 +- .../cruncher/class_CruncherWorkUnitFetcherTask.php | 4 ++-- .../block_fetcher/class_MinerBlockFetcherTask.php | 4 ++-- .../class_MinerRealGenesisBlockProducerTask.php | 4 ++-- .../class_MinerTestGenesisBlockProducerTask.php | 2 +- .../template/class_BaseXmlTemplateEngine.php | 4 ++-- .../class_XmlObjectRegistryTemplateEngine.php | 2 +- core | 2 +- 101 files changed, 316 insertions(+), 396 deletions(-) diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index e31e1a08d..584f8fdf3 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -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; /** diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php index b56b193f8..3f931383b 100644 --- a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php @@ -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. ---'); diff --git a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php index 78bde3465..fb95de6d0 100644 --- a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php @@ -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. ---'); diff --git a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php index fc0459c43..47a39f8f2 100644 --- a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php @@ -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. ---'); diff --git a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php index 3537e5c29..d9d319e48 100644 --- a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php @@ -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. ---'); diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php index bae067d51..f72526cc3 100644 --- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php @@ -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. ---'); diff --git a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php index 7e421aabf..5fdce95c8 100644 --- a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php @@ -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. ---'); diff --git a/application/hub/classes/crawler/class_BaseNodeCrawler.php b/application/hub/classes/crawler/class_BaseNodeCrawler.php index 37c11b957..796ad8181 100644 --- a/application/hub/classes/crawler/class_BaseNodeCrawler.php +++ b/application/hub/classes/crawler/class_BaseNodeCrawler.php @@ -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(); diff --git a/application/hub/classes/cruncher/class_BaseHubCruncher.php b/application/hub/classes/cruncher/class_BaseHubCruncher.php index 3afa60516..6aa01bf8b 100644 --- a/application/hub/classes/cruncher/class_BaseHubCruncher.php +++ b/application/hub/classes/cruncher/class_BaseHubCruncher.php @@ -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(); diff --git a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php index 9d1bf5499..2bcfb5cd9 100644 --- a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php +++ b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php @@ -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 ...'); diff --git a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php index a944c6070..e7c444c31 100644 --- a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php +++ b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php index 74e3571a1..405324317 100644 --- a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php +++ b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/class_ b/application/hub/classes/factories/class_ index fead6053d..b7bfcbbf8 100644 --- a/application/hub/classes/factories/class_ +++ b/application/hub/classes/factories/class_ @@ -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 diff --git a/application/hub/classes/factories/client/class_ClientFactory.php b/application/hub/classes/factories/client/class_ClientFactory.php index 07314c411..c5349db5b 100644 --- a/application/hub/classes/factories/client/class_ClientFactory.php +++ b/application/hub/classes/factories/client/class_ClientFactory.php @@ -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 diff --git a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php index 6f751fa92..358703523 100644 --- a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php +++ b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/decoder/class_DecoderFactory.php b/application/hub/classes/factories/decoder/class_DecoderFactory.php index 8f3fb5827..d52be0428 100644 --- a/application/hub/classes/factories/decoder/class_DecoderFactory.php +++ b/application/hub/classes/factories/decoder/class_DecoderFactory.php @@ -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 diff --git a/application/hub/classes/factories/dht/class_DhtObjectFactory.php b/application/hub/classes/factories/dht/class_DhtObjectFactory.php index 7dc5f7348..20f162c42 100644 --- a/application/hub/classes/factories/dht/class_DhtObjectFactory.php +++ b/application/hub/classes/factories/dht/class_DhtObjectFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php index b2a7779bd..f84d30795 100644 --- a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php +++ b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php index eef385723..8840ec51f 100644 --- a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php +++ b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php @@ -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 diff --git a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php index 3a55463c5..e2f8ff2f2 100644 --- a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php +++ b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php index a4ff9a8b1..51dee98b6 100644 --- a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php +++ b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php @@ -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 diff --git a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php index 18bcbd197..30092a940 100644 --- a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php +++ b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php @@ -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 diff --git a/application/hub/classes/factories/lists/class_RecipientListFactory.php b/application/hub/classes/factories/lists/class_RecipientListFactory.php index f94169689..1c14a5e4b 100644 --- a/application/hub/classes/factories/lists/class_RecipientListFactory.php +++ b/application/hub/classes/factories/lists/class_RecipientListFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/locator/class_UniversalNodeLocatorFactory.php b/application/hub/classes/factories/locator/class_UniversalNodeLocatorFactory.php index fda188fd5..e58bb56f5 100644 --- a/application/hub/classes/factories/locator/class_UniversalNodeLocatorFactory.php +++ b/application/hub/classes/factories/locator/class_UniversalNodeLocatorFactory.php @@ -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 diff --git a/application/hub/classes/factories/node/class_NodeObjectFactory.php b/application/hub/classes/factories/node/class_NodeObjectFactory.php index 88ce7e927..dff30a71b 100644 --- a/application/hub/classes/factories/node/class_NodeObjectFactory.php +++ b/application/hub/classes/factories/node/class_NodeObjectFactory.php @@ -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); diff --git a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php index addaf6ea9..68ee8c20d 100644 --- a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php +++ b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/package/class_NetworkPackageFactory.php b/application/hub/classes/factories/package/class_NetworkPackageFactory.php index c227d3f98..5a46f7183 100644 --- a/application/hub/classes/factories/package/class_NetworkPackageFactory.php +++ b/application/hub/classes/factories/package/class_NetworkPackageFactory.php @@ -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 diff --git a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php index a6be051e1..d894f90e7 100644 --- a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php +++ b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/producer/class_ProducerFactory.php b/application/hub/classes/factories/producer/class_ProducerFactory.php index 5430763b0..55fd7be61 100644 --- a/application/hub/classes/factories/producer/class_ProducerFactory.php +++ b/application/hub/classes/factories/producer/class_ProducerFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php index 6304115a6..be12c3e6d 100644 --- a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php +++ b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php index d337e6b8d..d40014ca7 100644 --- a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php +++ b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php @@ -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 diff --git a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php index bd73087d0..94d54b343 100644 --- a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php +++ b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php @@ -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 diff --git a/application/hub/classes/factories/socket/class_SocketFactory.php b/application/hub/classes/factories/socket/class_SocketFactory.php index c52716333..d0d4a2f34 100644 --- a/application/hub/classes/factories/socket/class_SocketFactory.php +++ b/application/hub/classes/factories/socket/class_SocketFactory.php @@ -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? diff --git a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php index cb9687cf5..7baeac614 100644 --- a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php +++ b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php index ac8a99070..5dea3a887 100644 --- a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php +++ b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php @@ -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 diff --git a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php index f05631534..31ffe7eb9 100644 --- a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php +++ b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php @@ -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() . '.'); diff --git a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php index 4904d7d6b..466e1cb30 100644 --- a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php +++ b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php @@ -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); diff --git a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php index 50339d430..924476590 100644 --- a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php +++ b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php @@ -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); diff --git a/application/hub/classes/factories/tags/class_PackageTagsFactory.php b/application/hub/classes/factories/tags/class_PackageTagsFactory.php index e23e3357d..e03fbead7 100644 --- a/application/hub/classes/factories/tags/class_PackageTagsFactory.php +++ b/application/hub/classes/factories/tags/class_PackageTagsFactory.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php index 9b9acc615..caf683b8a 100644 --- a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php +++ b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php index 6ed5105a0..3b84a675a 100644 --- a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php +++ b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php index 43b5dd8e0..f3a83bd2c 100644 --- a/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php +++ b/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap index 24d0ad15e..ec532494f 100644 --- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap +++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php index c5ec09978..c6a577c13 100644 --- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php +++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php index 1dabf9fad..e2dc0cf78 100644 --- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php +++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap index f86f5fcc4..55e8d83b9 100644 --- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap +++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php index 830bf1ad7..bcde1a6ca 100644 --- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php +++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php index 7b6d3334f..1291a2449 100644 --- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php +++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap index 66bbd20c7..9628d1ec6 100644 --- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap +++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php index 10df8349e..d11346608 100644 --- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php +++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php index cd4931725..78a2e667f 100644 --- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php +++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap index db245f5ae..219138c2c 100644 --- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap +++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php index 8fab686a3..e7c2ee61b 100644 --- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php +++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php index 3714e7e46..b07adb21b 100644 --- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php +++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php index 24dc31979..7b1a17681 100644 --- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php +++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap index c321091c0..b5d63fe53 100644 --- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap +++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php index 86ed47a03..ccb40cfa2 100644 --- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php +++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php index a25be4ea1..2d00a9b68 100644 --- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php +++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php @@ -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(); diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php index 60288d8e6..935a06a8b 100644 --- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php +++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php index 7960f588e..b72b70d98 100644 --- a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php +++ b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php b/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php index db95df562..ee4ca4af1 100644 --- a/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php +++ b/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php @@ -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(); diff --git a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php index dc1acf8e3..e584121be 100644 --- a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php +++ b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php b/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php index 3e5f7db14..3c42ba4e3 100644 --- a/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php +++ b/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php @@ -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(); diff --git a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php index bdc465470..0cb44b879 100644 --- a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php +++ b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php @@ -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); diff --git a/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php b/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php index dc1b7da89..92b37c3d0 100644 --- a/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php +++ b/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php @@ -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(); diff --git a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php index 44d5dbf88..8d468e5ff 100644 --- a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php +++ b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php @@ -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); diff --git a/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php b/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php index ee9b164ff..c287e5b65 100644 --- a/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php +++ b/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php b/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php index ed0df03bc..cc5cff48b 100644 --- a/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php +++ b/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php @@ -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(); diff --git a/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php b/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php index 5feb6e5e1..6cc83f405 100644 --- a/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php +++ b/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php @@ -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(); diff --git a/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php b/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php index e198c68e2..36e0cc49d 100644 --- a/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php +++ b/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php @@ -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(); diff --git a/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php b/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php index bdecf7262..f101349c3 100644 --- a/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php +++ b/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php @@ -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(); diff --git a/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php b/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php index 1a64a469e..5499c63b6 100644 --- a/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php +++ b/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php @@ -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(); diff --git a/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php b/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php index 4c06c24a4..936e7ed9c 100644 --- a/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php +++ b/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php @@ -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(); diff --git a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php index ab2c61bc0..4e94682c0 100644 --- a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php index ac8d092a4..b4ba8482d 100644 --- a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php index 4ee24df93..59b92509c 100644 --- a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php index a0512affe..eb7ad1fce 100644 --- a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php index bee3110b0..6eec697ac 100644 --- a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php @@ -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] -?> +} diff --git a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php index 49f296c27..2f1fa0dbf 100644 --- a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php +++ b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php @@ -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'); diff --git a/application/hub/classes/handler/data/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php b/application/hub/classes/handler/data/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php index ad0686576..a322a9841 100644 --- a/application/hub/classes/handler/data/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php +++ b/application/hub/classes/handler/data/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php @@ -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] -?> +} diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php index ec8ea7e9f..461624eef 100644 --- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php +++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php @@ -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'); diff --git a/application/hub/classes/miner/class_BaseHubMiner.php b/application/hub/classes/miner/class_BaseHubMiner.php index 32cacec42..d6b92bf53 100644 --- a/application/hub/classes/miner/class_BaseHubMiner.php +++ b/application/hub/classes/miner/class_BaseHubMiner.php @@ -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'); diff --git a/application/hub/classes/nodes/boot/class_HubBootNode.php b/application/hub/classes/nodes/boot/class_HubBootNode.php index 54232ea84..ebfad64e8 100644 --- a/application/hub/classes/nodes/boot/class_HubBootNode.php +++ b/application/hub/classes/nodes/boot/class_HubBootNode.php @@ -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(); diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php index 22a0af395..7757175a0 100644 --- a/application/hub/classes/nodes/class_BaseHubNode.php +++ b/application/hub/classes/nodes/class_BaseHubNode.php @@ -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); diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php index 6ecdcdbfa..771d08bf4 100644 --- a/application/hub/classes/nodes/list/class_HubListNode.php +++ b/application/hub/classes/nodes/list/class_HubListNode.php @@ -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] -?> +} diff --git a/application/hub/classes/nodes/master/class_HubMasterNode.php b/application/hub/classes/nodes/master/class_HubMasterNode.php index 41039aa2a..f9f57b0db 100644 --- a/application/hub/classes/nodes/master/class_HubMasterNode.php +++ b/application/hub/classes/nodes/master/class_HubMasterNode.php @@ -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] -?> +} diff --git a/application/hub/classes/nodes/regular/class_HubRegularNode.php b/application/hub/classes/nodes/regular/class_HubRegularNode.php index ad0b6eeb6..d4e9e9147 100644 --- a/application/hub/classes/nodes/regular/class_HubRegularNode.php +++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php @@ -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] -?> +} diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php index 66b8fb22e..c4ac7d04b 100644 --- a/application/hub/classes/package/class_NetworkPackage.php +++ b/application/hub/classes/package/class_NetworkPackage.php @@ -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()); diff --git a/application/hub/classes/pools/class_BasePool.php b/application/hub/classes/pools/class_BasePool.php index e666d6a82..d83040ce9 100644 --- a/application/hub/classes/pools/class_BasePool.php +++ b/application/hub/classes/pools/class_BasePool.php @@ -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? diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php index 5f0783fb3..02887dd4a 100644 --- a/application/hub/classes/producer/class_BaseProducer.php +++ b/application/hub/classes/producer/class_BaseProducer.php @@ -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); diff --git a/application/hub/classes/tags/package/class_PackageTags.php b/application/hub/classes/tags/package/class_PackageTags.php index 03d026cc1..ca6a40440 100644 --- a/application/hub/classes/tags/package/class_PackageTags.php +++ b/application/hub/classes/tags/package/class_PackageTags.php @@ -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'); diff --git a/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php b/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php index c9466c45e..14abf79d0 100644 --- a/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php +++ b/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php @@ -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] -?> +} diff --git a/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php b/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php index 8132033d8..3fd2c4ac1 100644 --- a/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php +++ b/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php @@ -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()); diff --git a/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php b/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php index b6ac893b6..0479743ba 100644 --- a/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php +++ b/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php @@ -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()); diff --git a/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php b/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php index eb6c46308..96567726c 100644 --- a/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php +++ b/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php @@ -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(); } /** diff --git a/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php b/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php index 24bd32142..64a071d3b 100644 --- a/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php +++ b/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php @@ -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(); } /** diff --git a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php index 78ae40a8b..74353fae7 100644 --- a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php +++ b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php @@ -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()); diff --git a/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php b/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php index ae2e0be06..1c4a34405 100644 --- a/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php +++ b/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php @@ -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()); diff --git a/application/hub/classes/template/class_BaseXmlTemplateEngine.php b/application/hub/classes/template/class_BaseXmlTemplateEngine.php index 37097c05b..e98a4954c 100644 --- a/application/hub/classes/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/classes/template/class_BaseXmlTemplateEngine.php @@ -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') . '/'; diff --git a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php index dd696adbe..e209cde44 100644 --- a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php +++ b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php @@ -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 de0eb5a71..bed81d8ed 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit de0eb5a71c8f65df71712ba9c5cd7092baa8d980 +Subproject commit bed81d8edc3673951a1ee57f38f5a1a07c417b69 -- 2.39.5