Continued:

- imported NodeStateFactory
- nope, to much deep namespace
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index c03297ab159efc07a8e625c1604ba42fdc6e07c9..61e88833bb12b3c1d6ac0c60adefdb87a1a35696 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -4,6 +4,7 @@ namespace Hub\Node;
 
 // Import hub-specific stuff
 use Hub\Database\Frontend\Node\Information\NodeInformationDatabaseWrapper;
+use Hub\Factory\State\Node\NodeStateFactory;
 use Hub\Generic\BaseHubSystem;
 use Hub\Network\Receive\Receivable;
 use Hub\Tools\HubTools;

diff --git a/application/hub/classes/states/node/active/class_NodeActiveState.php b/application/hub/classes/states/node/active/class_NodeActiveState.php
index 3ce52937dcad82be83d71598dab30946235b9eea..d7d5197e203eb2e2f9e866b9f2d2d82b31cd7eac 100644 (file)
--- a/application/hub/classes/states/node/active/class_NodeActiveState.php
+++ b/application/hub/classes/states/node/active/class_NodeActiveState.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace Hub\State\Node\Active;
+namespace Hub\State\Node;
 
-// Import application-specific stuff
-use Hub\Factory\Node\NodeObjectFactory;
+// Import framework stuff
+use Hub\Factory\State\Node\NodeStateFactory;
 
 /**
  * An active node state class

diff --git a/application/hub/classes/states/node/announced/class_NodeAnnouncingState.php b/application/hub/classes/states/node/announced/class_NodeAnnouncingState.php
index d8b114eaa80e0c9594cb234a8c29890593ed1f81..5f5ccc1dd48ed2ee670084d8abb408989715db63 100644 (file)
--- a/application/hub/classes/states/node/announced/class_NodeAnnouncingState.php
+++ b/application/hub/classes/states/node/announced/class_NodeAnnouncingState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\State\Node;
+
+// Import framework stuff
+use Hub\Factory\State\Node\NodeStateFactory;
+
 /**
  * A Announcing node state class
  *

diff --git a/application/hub/classes/states/node/init/class_NodeInitState.php b/application/hub/classes/states/node/init/class_NodeInitState.php
index 6f4014f17a421d3b91de0dc14625a54778731b74..b5c9b439a5b309e72ca8d9adabc6f5682428a7d4 100644 (file)
--- a/application/hub/classes/states/node/init/class_NodeInitState.php
+++ b/application/hub/classes/states/node/init/class_NodeInitState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\State\Node;
+
+// Import framework stuff
+use Hub\Factory\State\Node\NodeStateFactory;
+
 /**
  * A init node state class
  *
@@ -59,7 +65,5 @@ class NodeInitState extends BaseNodeState implements Stateable {
                // Create the new state instance
                NodeStateFactory::createNodeStateInstanceByName('virgin');
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/classes/states/node/seniors/class_NodeReachableState.php b/application/hub/classes/states/node/seniors/class_NodeReachableState.php
index 4241988774d756ed214742cf10ed29c7871f795f..2f311140df55cbc63636fb67c004836727583546 100644 (file)
--- a/application/hub/classes/states/node/seniors/class_NodeReachableState.php
+++ b/application/hub/classes/states/node/seniors/class_NodeReachableState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\State\Node;
+
+// Import framework stuff
+use Hub\Factory\State\Node\NodeStateFactory;
+
 /**
  * A Reachable node state class
  *

diff --git a/application/hub/classes/states/node/virgin/class_NodeVirginState.php b/application/hub/classes/states/node/virgin/class_NodeVirginState.php
index 2d83f58e15952e0da5b796ce2704dc490a70b4f0..68c3ce622c0c37bc3975ac683dda12751cbbde49 100644 (file)
--- a/application/hub/classes/states/node/virgin/class_NodeVirginState.php
+++ b/application/hub/classes/states/node/virgin/class_NodeVirginState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\State\Node;
+
+// Import framework stuff
+use Hub\Factory\State\Node\NodeStateFactory;
+
 /**
  * A virgin node state class
  *

diff --git a/core b/core
index 54a56ed3c7cef5e7989100d2c5a7de8647d545de..49fe7de1c03a4424e4f62a70c8ab1eae2593faf0 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 54a56ed3c7cef5e7989100d2c5a7de8647d545de
+Subproject commit 49fe7de1c03a4424e4f62a70c8ab1eae2593faf0