Updated 'core'.

[hub.git] / application / hub / main / factories / states / node / class_NodeStateFactory.php

diff --git a/application/hub/main/factories/states/node/class_NodeStateFactory.php b/application/hub/main/factories/states/node/class_NodeStateFactory.php
index 2fd672477672727154b0d8d7ecb6a43a75e3d53c..46212da4f391acaaafc7a230570845bf45ea278a 100644 (file)
--- a/application/hub/main/factories/states/node/class_NodeStateFactory.php
+++ b/application/hub/main/factories/states/node/class_NodeStateFactory.php
@@ -2,11 +2,11 @@
 /**
  * A factory class for node states
  *
- * @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
@@ -37,22 +37,31 @@ class NodeStateFactory extends ObjectFactory {
         * given node instance.
         *
         * @param       $stateName              Name of the state
-        * @param       $nodeInstance   A NodeHelper class instance
+        * @param       $nodeInstance   An instance of a NodeHelper class (optional)
         * @return      $stateInstance  A Stateable class instance
         */
-       public static final function createNodeStateInstanceByName ($stateName, NodeHelper $nodeInstance) {
+       public static final function createNodeStateInstanceByName ($stateName, NodeHelper $nodeInstance = NULL) {
                // Then construct the class' configuraton entry
                $className = 'node_' . $stateName . '_state_class';
 
+               // Is the node instance set?
+               if (is_null($nodeInstance)) {
+                       // Get node instance from registry
+                       $nodeInstance = NodeObjectFactory::createNodeInstance();
+               } // END - if
+
                // Get a class from that configuration entry
                $stateInstance = self::createObjectByConfiguredName($className, array($nodeInstance));
 
                // Debug message
-               $stateInstance->debugOutput('NODE-STATE-FACTORY[' . __LINE__ . ']: Node state has changed from ' . $nodeInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
+               self::createDebugInstance(__CLASS__)->debugOutput('NODE-STATE-FACTORY[' . __METHOD__ . ':' . __LINE__ . ']: Node state has changed from ' . $nodeInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
 
                // Once we have that state, set it in the node instance
                $nodeInstance->setStateInstance($stateInstance);
 
+               // Update node data
+               $nodeInstance->updateNodeData();
+
                // For any purposes, return the state instance
                return $stateInstance;
        }