Merge branch 'master' into refacuring/protocol_handler

[hub.git] / application / hub / main / nodes / master / class_HubMasterNode.php

diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php
index 5de2a59ddcd889fbede98d03a7339bcfffede0a8..91f05aa2d342d72a859c4a19bc7c4d4fe86b9026 100644 (file)
--- a/application/hub/main/nodes/master/class_HubMasterNode.php
+++ b/application/hub/main/nodes/master/class_HubMasterNode.php
@@ -2,11 +2,11 @@
 /**
  * A hub-node class for the 'Master' mode
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class HubMasterNode extends BaseHubNode implements NodeHelper {
+class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable {
        /**
         * Protected constructor
         *
@@ -38,20 +38,13 @@ class HubMasterNode extends BaseHubNode implements NodeHelper {
         * @param       $requestInstance        An instance of a Requestable class
         * @return      $nodeInstance           An instance of this hub-node class
         */
-       public final static function createHubMasterNode (Requestable $requestInstance) {
+       public static final function createHubMasterNode (Requestable $requestInstance) {
                // Get a new instance
                $nodeInstance = new HubMasterNode();
 
                // Set the request instance
                $nodeInstance->setRequestInstance($requestInstance);
 
-               // --------------------- Hub-id acquirement phase ---------------------
-               // Acquire a hub-id. This step generates on first launch a new one and
-               // on any later launches it will restore the hub-id from the database.
-               // A passed 'nickname=xxx' argument will be used to add some
-               // 'personality' to the hub.
-               $nodeInstance->acquireHubId();
-
                // Return the instance
                return $nodeInstance;
        }
@@ -65,12 +58,41 @@ class HubMasterNode extends BaseHubNode implements NodeHelper {
         * @todo        Implement this method
         */
        public function doBootstrapping () {
-               // Call generic (parent) bootstrapping method first
-               parent::doGenericBootstrapping();
-               $this->partialStub('Please implement this method.');
+               // Enable acceptance of announcements
+               $this->enableAcceptingAnnouncements();
+
+               // Do more steps
+               $this->partialStub('Please implement more boot-strapping steps!');
+       }
+
+       /**
+        * Add some node-specific filters
+        *
+        * @return      void
+        */
+       public function addExtraNodeFilters () {
+               // Get the application instance from registry
+               $applicationInstance = Registry::getRegistry()->getInstance('app');
 
-               // This should be the last line: output teaser
-               $this->outputConsoleTeaser();
+               // Get the controller from the application
+               $controllerInstance = $applicationInstance->getControllerInstance();
+
+               // Self-announcement task
+               $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('node_activation_announcement_task_filter'));
+
+               // @TODO Add some filters here
+               $this->partialStub('Add some filters here.');
+       }
+
+       /**
+        * Adds extra tasks to the given handler for this node
+        *
+        * @param       $handlerInstance        An instance of a HandleableTask class
+        * @return      void
+        * @todo        0% done
+        */
+       public function addExtraTasks (HandleableTask $handlerInstance) {
+               $this->partialStub('Please add some tasks or empty this method.');
        }
 }