From bcc1a7c57342753426522ccb7abe681396c861f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 19 May 2017 16:07:53 +0200
Subject: [PATCH] Continued: - imported NodeStateFactory - nope, to much deep
 namespace - updated core framework
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/hub/classes/nodes/class_BaseHubNode.php    |  1 +
 .../states/node/active/class_NodeActiveState.php       |  6 +++---
 .../node/announced/class_NodeAnnouncingState.php       |  6 ++++++
 .../classes/states/node/init/class_NodeInitState.php   | 10 +++++++---
 .../states/node/seniors/class_NodeReachableState.php   |  6 ++++++
 .../states/node/virgin/class_NodeVirginState.php       |  6 ++++++
 core                                                   |  2 +-
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index c03297ab1..61e88833b 100644
--- 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 3ce52937d..d7d5197e2 100644
--- 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 d8b114eaa..5f5ccc1dd 100644
--- 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 6f4014f17..b5c9b439a 100644
--- 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 424198877..2f311140d 100644
--- 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 2d83f58e1..68c3ce622 100644
--- 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 54a56ed3c..49fe7de1c 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 54a56ed3c7cef5e7989100d2c5a7de8647d545de
+Subproject commit 49fe7de1c03a4424e4f62a70c8ab1eae2593faf0
-- 
2.39.5