Some methods renamed

diff --git a/application/hub/interfaces/cruncher/class_CruncherHelper.php b/application/hub/interfaces/cruncher/class_CruncherHelper.php
index e95431a29a5f3d4b5dffb0c961538dbcc93f5e0f..3aaf7bb431a3768d46820e954c07da6ec9db11e5 100644 (file)
--- a/application/hub/interfaces/cruncher/class_CruncherHelper.php
+++ b/application/hub/interfaces/cruncher/class_CruncherHelper.php
@@ -45,7 +45,7 @@ interface CruncherHelper extends FrameworkInterface {
         *
         * @return      void
         */
-       function addExtraHubFilters ();
+       function addExtraCruncherFilters ();
 }
 
 // [EOF]

diff --git a/application/hub/interfaces/nodes/class_NodeHelper.php b/application/hub/interfaces/nodes/class_NodeHelper.php
index c90d2c9180f1da2c9594cd6152645b028a6dc03f..6480248ae8d9473694a6b7f8951c050a74d59a94 100644 (file)
--- a/application/hub/interfaces/nodes/class_NodeHelper.php
+++ b/application/hub/interfaces/nodes/class_NodeHelper.php
@@ -52,7 +52,7 @@ interface NodeHelper extends FrameworkInterface {
         *
         * @return      void
         */
-       function addExtraHubFilters ();
+       function addExtraNodeFilters ();
 
        /**
         * Generic method to acquire a hub-id. On first run this generates a new one
@@ -73,7 +73,7 @@ interface NodeHelper extends FrameworkInterface {
         * @param       $responseInstance       A Responseable class
         * @return      void
         */
-       function activateHub (Requestable $requestInstance, Responseable $responseInstance);
+       function activateNode (Requestable $requestInstance, Responseable $responseInstance);
 
        /**
         * Generates a session id which will be sent to the other hubs and peers
@@ -101,7 +101,7 @@ interface NodeHelper extends FrameworkInterface {
         *
         * @return      void
         */
-       function addExtraHubFilters ();
+       function addExtraNodeFilters ();
 
        /**
         * Announces this hub to the upper (bootstrap or list) hubs. After this is

diff --git a/application/hub/main/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/main/commands/console/class_HubConsoleCruncherCommand.php
index 6c7d779c894aae94a043d82e75ca4230824ffd6a..71679c920c2373effed48ca16b2b546b52364b2c 100644 (file)
--- a/application/hub/main/commands/console/class_HubConsoleCruncherCommand.php
+++ b/application/hub/main/commands/console/class_HubConsoleCruncherCommand.php
@@ -69,6 +69,12 @@ class HubConsoleCruncherCommand extends BaseCommand implements Commandable {
                $applicationInstance->getControllerInstance()->executeBootstrapFilters($requestInstance, $responseInstance);
                $this->debugOutput('BOOTSTRAP: Bootstrap finished.');
 
+               // Get cruncher instance
+               $cruncherInstance = Registry::getRegistry()->getInstance('cruncher');
+
+               // Add some cruncher-specific filters, e.g. announcement
+               $cruncherInstance->addExtraCruncherFilters();
+
                // Get task handler instance
                $handlerInstance = Registry::getRegistry()->getInstance('task');
 

diff --git a/application/hub/main/commands/console/class_HubConsoleMainCommand.php b/application/hub/main/commands/console/class_HubConsoleMainCommand.php
index cb0e46358f467368f9a35cd23735b07b6d09c2c3..85a82af78fb58fc4636b3f93e136dcdc09861934 100644 (file)
--- a/application/hub/main/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/main/commands/console/class_HubConsoleMainCommand.php
@@ -73,12 +73,12 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable {
                $nodeInstance = Registry::getRegistry()->getInstance('node');
 
                // Add some node-specific filters, e.g. announcement
-               $nodeInstance->addExtraHubFilters();
+               $nodeInstance->addExtraNodeFilters();
 
                // -------------------------- Hub activation --------------------------
                // Activates the hub by doing some final preparation steps and setting
                // the attribute $hubIsActive to true
-               $nodeInstance->activateHub($requestInstance, $responseInstance);
+               $nodeInstance->activateNode($requestInstance, $responseInstance);
 
                // Get task handler instance
                $handlerInstance = Registry::getRegistry()->getInstance('task');

diff --git a/application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php b/application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php
index 2ccebd716f41787a2075b71a5cf7a66dd3d2ac97..c0f7ac8eba2de7cfb3fb05d34f23ac0cf6f78a11 100644 (file)
--- a/application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php
+++ b/application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * A hub-cruncher class for the 'Cruncher' mode
+ * A hub-mcrypt cruncher class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
@@ -36,7 +36,7 @@ class HubMcryptCruncher extends BaseHubCruncher implements CruncherHelper, Regis
         * Creates an instance of this hub-cruncher class
         *
         * @param       $requestInstance        An instance of a Requestable class
-        * @return      $cruncherInstance               An instance of this hub-cruncher class
+        * @return      $cruncherInstance       An instance of this hub-cruncher class
         */
        public final static function createHubMcryptCruncher (Requestable $requestInstance) {
                // Get a new instance
@@ -78,7 +78,7 @@ class HubMcryptCruncher extends BaseHubCruncher implements CruncherHelper, Regis
         *
         * @return      void
         */
-       public function addExtraHubFilters () {
+       public function addExtraCruncherFilters () {
                // Add some filters here
        }
 }

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index 54e03aa749048ff45fe42a03d64140a15de12d64..ee6faf45409933c80ac58f7892a356371f453bd8 100644 (file)
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -109,7 +109,7 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
         *
         * @return      void
         */
-       public function addExtraHubFilters () {
+       public function addExtraNodeFilters () {
                // Get the application instance from registry
                $applicationInstance = Registry::getRegistry()->getInstance('app');
 

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index c46b4a5c6c522878bd98aba41af029800b947923..086e1da599f44b677b734970e2fa58400f91e0d4 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -548,7 +548,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         * @param       $responseInstance       A Responseable class
         * @return      void
         */
-       public function activateHub (Requestable $requestInstance, Responseable $responseInstance) {
+       public function activateNode (Requestable $requestInstance, Responseable $responseInstance) {
                // Checks wether a listener is still active and shuts it down if one
                // is still listening.
                if (($this->determineIfListenerIsActive()) && ($this->getIsActive())) {

diff --git a/application/hub/main/nodes/list/class_HubListNode.php b/application/hub/main/nodes/list/class_HubListNode.php
index 26782ed73a0fba7d81c5e56abcba2f0930175478..572d7f954b2e963972f8fb53b24068ac6bcaf665 100644 (file)
--- a/application/hub/main/nodes/list/class_HubListNode.php
+++ b/application/hub/main/nodes/list/class_HubListNode.php
@@ -78,7 +78,7 @@ class HubListNode extends BaseHubNode implements NodeHelper, Registerable {
         *
         * @return      void
         */
-       public function addExtraHubFilters () {
+       public function addExtraNodeFilters () {
                // Get the application instance from registry
                $applicationInstance = Registry::getRegistry()->getInstance('app');
 

diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php
index 392c15f1095fda958e04223fcc0a3779188178f2..4cca8217b104c83c807ab058477050e465feb0b4 100644 (file)
--- a/application/hub/main/nodes/master/class_HubMasterNode.php
+++ b/application/hub/main/nodes/master/class_HubMasterNode.php
@@ -78,7 +78,7 @@ class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable {
         *
         * @return      void
         */
-       public function addExtraHubFilters () {
+       public function addExtraNodeFilters () {
                // Get the application instance from registry
                $applicationInstance = Registry::getRegistry()->getInstance('app');
 

diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php
index 201e250cf0014e56e4d343a096b00e0a7810d6a4..e6db875654d43f90371270aae9685d1163916bfb 100644 (file)
--- a/application/hub/main/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/main/nodes/regular/class_HubRegularNode.php
@@ -78,7 +78,7 @@ class HubRegularNode extends BaseHubNode implements NodeHelper, Registerable {
         *
         * @return      void
         */
-       public function addExtraHubFilters () {
+       public function addExtraNodeFilters () {
                // Get the application instance from registry
                $applicationInstance = Registry::getRegistry()->getInstance('app');