Updated 'core'.

[hub.git] / application / hub / main / states / node / active / class_NodeActiveState.php

diff --git a/application/hub/main/states/node/active/class_NodeActiveState.php b/application/hub/main/states/node/active/class_NodeActiveState.php
index 3b2cb250a095bdd36aeceeea8c2c98558ec60e09..0352ff754aabdccfe2052083fcb83ae30c7d578e 100644 (file)
--- a/application/hub/main/states/node/active/class_NodeActiveState.php
+++ b/application/hub/main/states/node/active/class_NodeActiveState.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -38,18 +38,14 @@ class NodeActiveState extends BaseNodeState implements Stateable {
        /**
         * Creates an instance of this class
         *
-        * @param       $nodeInstance   An instance of a NodeHelper class
         * @return      $stateInstance  An instance of a Stateable class
         */
-       public static final function createNodeActiveState (NodeHelper $nodeInstance) {
+       public static final function createNodeActiveState () {
                // Get new instance
                $stateInstance = new NodeActiveState();
 
-               // Enable isActive flag in node instance
-               $nodeInstance->enableIsActive();
-
-               // Set the node instance
-               $stateInstance->setNodeInstance($nodeInstance);
+               // Get node instance and set 'active' flag
+               NodeObjectFactory::createNodeInstance()->enableIsActive();
 
                // Return the prepared instance
                return $stateInstance;
@@ -60,9 +56,9 @@ class NodeActiveState extends BaseNodeState implements Stateable {
         *
         * @return      void
         */
-       public function nodeAnnouncedToUpperHubs () {
+       public function nodeAnnouncingToUpperHubs () {
                // Create the new state instance
-               NodeStateFactory::createNodeStateInstanceByName('announced', $this->getNodeInstance());
+               NodeStateFactory::createNodeStateInstanceByName('announcing');
        }
 
        /**
@@ -76,7 +72,7 @@ class NodeActiveState extends BaseNodeState implements Stateable {
         */
        public function nodeHasSelfConnected () {
                // Create the new state instance
-               NodeStateFactory::createNodeStateInstanceByName('reachable', $this->getNodeInstance());
+               NodeStateFactory::createNodeStateInstanceByName('reachable');
        }
 }