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 d73bc99008210a887277d89c12d2576ff1d675c8..0352ff754aabdccfe2052083fcb83ae30c7d578e 100644 (file)
--- a/application/hub/main/states/node/active/class_NodeActiveState.php
+++ b/application/hub/main/states/node/active/class_NodeActiveState.php
@@ -2,11 +2,11 @@
 /**
  * An active node state class
  *
- * @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 - 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.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
@@ -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,23 @@ class NodeActiveState extends BaseNodeState implements Stateable {
         *
         * @return      void
         */
-       public function nodeAnnouncedToUpperHubs () {
+       public function nodeAnnouncingToUpperHubs () {
+               // Create the new state instance
+               NodeStateFactory::createNodeStateInstanceByName('announcing');
+       }
+
+       /**
+        * State change for if the node has just connected to itself and
+        * node/session id are both equal. The self-connect means that
+        * the node possibly reachable from outside. This may require
+        * confirmation by other peers.
+        *
+        * @return      void
+        * @todo        We might want to move some calls to this method to fill it with life
+        */
+       public function nodeHasSelfConnected () {
                // Create the new state instance
-               NodeStateFactory::createNodeStateInstanceByName('announced', $this->getNodeInstance());
+               NodeStateFactory::createNodeStateInstanceByName('reachable');
        }
 }