Continued:

- Application instance in generic registry was a little of an overdoze when
  there is ApplicationHelper::getSelfInstance() around, this means lesser
  method invocations and a bit smaller footprint (one registry entry lesser)
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
index fe9b470a22b593f66a5a7e5f0ae9e7574af74ff7..b8391e180c73e703a16496f10a0171e7e75680da 100644 (file)
--- a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
+++ b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
@@ -4,6 +4,7 @@ namespace Org\Shipsimu\Hub\AptProxy;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -72,7 +73,7 @@ class NodeConsoleAptProxy extends BaseNodeAptProxy implements AptProxy, Register
         */
        public function outputConsoleTeaser () {
                // Get the app instance (for shortening our code)
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Output all lines
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');

diff --git a/application/hub/classes/chat/console/class_NodeConsoleChat.php b/application/hub/classes/chat/console/class_NodeConsoleChat.php
index da1fc45f884af30ea76d69b91e8ee523f27ea2cf..4218f690a44aa5c48b903f53c63245c4d557a50d 100644 (file)
--- a/application/hub/classes/chat/console/class_NodeConsoleChat.php
+++ b/application/hub/classes/chat/console/class_NodeConsoleChat.php
@@ -4,6 +4,7 @@ namespace Org\Shipsimu\Hub\Chat;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -72,7 +73,7 @@ class NodeConsoleChat extends BaseNodeChat implements Chatter, Registerable {
         */
        public function outputConsoleTeaser () {
                // Get the app instance (for shortening our code)
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Output all lines
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');

diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
index 81883d6afa8ff777cc7b627dd71d35c46ef08b31..491bbb0b3b916e085f46b3237830f199928d7eb9 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
@@ -7,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -72,7 +73,7 @@ class HubConsoleAptProxyCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
index a4b37312ec3f9a0c80cda017c8c240b09ac7954f..23efd85d09dc77fa222c31a1e52cd95f75548259 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
@@ -7,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -72,7 +73,7 @@ class HubConsoleChatCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
index fe4204ca798ab95bb8098e7a3d2c193cbc363fc2..decd9440347f60fdc0d68c5afcb0c822295d3a3e 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
@@ -7,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -72,7 +73,7 @@ class HubConsoleCrawlerCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
index 109f49a1717085d5440175f431d6ba3af8a6c4ca..02060911752942401185abc2d4de33ba9166045b 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
@@ -7,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -72,7 +73,7 @@ class HubConsoleCruncherCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
index 14e6a2276470c7a73ef2cde9ab90b1cdb5eab2c7..43ca8f16f087b97dad201355bc8bc428e420d7a9 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
@@ -10,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -75,7 +76,7 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
index 4840fa61f178bd49da28d97555212e92085617f4..bedf2e5dfd4daf514dd524ed5179c58fe1c7fd8f 100644 (file)
--- a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
@@ -7,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -72,7 +73,7 @@ class HubConsoleMinerCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get a registry and the application instance from it
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                /*
                 * ----------------------- Bootstrapping phase ------------------------

diff --git a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
index 5e7efdd8468bcd7b780864a1da71b97b675afa59..57698ec062b7d8ffcedcee62e182639206052502 100644 (file)
--- a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
+++ b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
@@ -4,6 +4,7 @@ namespace Org\Shipsimu\Hub\Crawler;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -73,7 +74,7 @@ class NodeConsoleCrawler extends BaseNodeCrawler implements Crawler, Registerabl
         */
        public function outputConsoleTeaser () {
                // Get the app instance (for shortening our code)
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Output all lines
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');

diff --git a/application/hub/classes/factories/node/class_NodeObjectFactory.php b/application/hub/classes/factories/node/class_NodeObjectFactory.php
index 1d526775bd737148bff30dbc31df4aab81300c71..96b966dfb2c399ed6d9000dcf2725a0a3d128148 100644 (file)
--- a/application/hub/classes/factories/node/class_NodeObjectFactory.php
+++ b/application/hub/classes/factories/node/class_NodeObjectFactory.php
@@ -5,6 +5,7 @@ namespace Org\Shipsimu\Hub\Factory\Node;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -90,7 +91,7 @@ class NodeObjectFactory extends ObjectFactory {
                        $nodeInstance = ObjectFactory::createObjectByName($className);
 
                        // Get a registry
-                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+                       $applicationInstance = ApplicationHelper::getSelfInstance();
 
                        // Add node-specific filters
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NODE-FACTORY: Registering node-specific filters, responseInstance[]=%s', gettype($responseInstance)));

diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
index 146c53d779575ac9e64db6ce4d81f5486a11bb37..5a22129de85b1de03a5c2569d078075f92dee53d 100644 (file)
--- a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
+++ b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
@@ -5,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -68,7 +69,7 @@ class AptProxyInitializationFilter extends BaseAptProxyFilter implements Filtera
                $proxyInstance = ObjectFactory::createObjectByConfiguredName('node_console_apt_proxy_class');
 
                // Get a registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Add apt-proxy-specific filters
                $proxyInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);

diff --git a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
index dbb1333f4d203c3bbf667e56126ccf1619ca7273..4e162e2703f311ad212760fe0b23a42e58ba9876 100644 (file)
--- a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
+++ b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
@@ -5,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -68,7 +69,7 @@ class ChatInitializationFilter extends BaseChatFilter implements Filterable {
                $chatInstance = ObjectFactory::createObjectByConfiguredName('node_console_chat_class');
 
                // Get a registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Add chat-specific filters
                $chatInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);

diff --git a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
index d82ac90ec1488678546a441f7ee9ecae711292c7..907d55b9316bcb3b812ea2fb08d8a7c3ca690107 100644 (file)
--- a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
+++ b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
@@ -8,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -71,7 +72,7 @@ class CrawlerInitializationFilter extends BaseCrawlerFilter implements Filterabl
                $crawlerInstance = ObjectFactory::createObjectByConfiguredName('node_console_crawler_class');
 
                // Get a registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Add crawler-specific filters
                $crawlerInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);

diff --git a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
index 1679643149d3dd5905b32564f7ffc3cba3a0af34..455ab8c062ba429b5d720e2cb5f4f72ab0c09fcf 100644 (file)
--- a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
+++ b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
@@ -89,7 +89,7 @@ class CruncherInitializationFilter extends BaseCruncherFilter implements Filtera
                        $cruncherInstance = ObjectFactory::createObjectByConfiguredName($configEntry);
 
                        // Get a registry
-                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+                       $applicationInstance = ApplicationHelper::getSelfInstance();
 
                        // Add cruncher-specific filters
                        $cruncherInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);

diff --git a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
index b14646918af64cea5601bbfe09b8645ac4beb4e0..d82488435eeaf9779b44d48e559e2ed546f05bb1 100644 (file)
--- a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
+++ b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
@@ -9,6 +9,7 @@ use Org\Shipsimu\Hub\Miner\Filter\BaseMinerFilter;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -89,7 +90,7 @@ class MinerInitializationFilter extends BaseMinerFilter implements Filterable {
                        $minerInstance = ObjectFactory::createObjectByConfiguredName($configEntry);
 
                        // Get a registry
-                       $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+                       $applicationInstance = ApplicationHelper::getSelfInstance();
 
                        // Add miner-specific filters
                        $minerInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);

diff --git a/application/hub/classes/nodes/boot/class_HubBootNode.php b/application/hub/classes/nodes/boot/class_HubBootNode.php
index 22e01fa173c4f69f278f0d1a65e2871ed99d8f3a..9eeec2d2f680276ac84d7f1e5934d6ee8ec638a0 100644 (file)
--- a/application/hub/classes/nodes/boot/class_HubBootNode.php
+++ b/application/hub/classes/nodes/boot/class_HubBootNode.php
@@ -10,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
@@ -117,7 +118,7 @@ class HubBootNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // 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 89a08ce2ad588262dc6a531208c2d3d14d31549b..28068ea26cb11c775131252b26098d59c3fd1f61 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -28,6 +28,7 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -311,7 +312,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
         */
        public function outputConsoleTeaser () {
                // Get the app instance (for shortening our code)
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Output all lines
                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');

diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php
index b167fd7240362973be548b669ec45da7ce00198b..28afe67a258ff7fabe24861e54bb84a109a7c95c 100644 (file)
--- a/application/hub/classes/nodes/list/class_HubListNode.php
+++ b/application/hub/classes/nodes/list/class_HubListNode.php
@@ -9,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
@@ -78,7 +79,7 @@ class HubListNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();

diff --git a/application/hub/classes/nodes/master/class_HubMasterNode.php b/application/hub/classes/nodes/master/class_HubMasterNode.php
index 3b57c97d7232d3af01133353733ac926fc11f2af..c5db64752ae67ea31192169486c05b0a4172ee3e 100644 (file)
--- a/application/hub/classes/nodes/master/class_HubMasterNode.php
+++ b/application/hub/classes/nodes/master/class_HubMasterNode.php
@@ -9,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
@@ -81,7 +82,7 @@ class HubMasterNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();

diff --git a/application/hub/classes/nodes/regular/class_HubRegularNode.php b/application/hub/classes/nodes/regular/class_HubRegularNode.php
index ce0bf1d86eb2892716d79486657ec33345530179..12ed769fb7d5f076d3150a976aa35156543f52fb 100644 (file)
--- a/application/hub/classes/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php
@@ -9,6 +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\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
@@ -78,7 +79,7 @@ class HubRegularNode extends BaseHubNode implements Node, Registerable {
         */
        public function addExtraNodeFilters () {
                // Get the application instance from registry
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Get the controller from the application
                $controllerInstance = $applicationInstance->getControllerInstance();

diff --git a/application/hub/classes/tags/package/class_PackageTags.php b/application/hub/classes/tags/package/class_PackageTags.php
index 66145e11070c90e9b2d2f39a25d9e5d51011ce28..5068a737a48d4ae0a70aef0ac108d6791791e295 100644 (file)
--- a/application/hub/classes/tags/package/class_PackageTags.php
+++ b/application/hub/classes/tags/package/class_PackageTags.php
@@ -16,6 +16,7 @@ use Org\Shipsimu\Hub\Template\Engine\Xml\ObjectRegistry\XmlObjectRegistryTemplat
 // Import framework stuff
 use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Factory\Template\XmlTemplateEngineFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
@@ -89,7 +90,7 @@ class PackageTags extends BaseTag implements Tagable {
        private function initObjectRegistry () {
                // Get the application instance
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('PACKAGE-TAGS: Initializing object registry - CALLED!');
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Get a XML template instance
                $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('node_object_registry_template_class');

diff --git a/core b/core
index 196ab0fc031d6987c87e8c5d257c39f664ec9151..c3da44af864dac278a45df35d39f5cd75ced35a2 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 196ab0fc031d6987c87e8c5d257c39f664ec9151
+Subproject commit c3da44af864dac278a45df35d39f5cd75ced35a2