From: Roland Häder <roland@mxchange.org>
Date: Fri, 19 May 2017 22:27:15 +0000 (+0200)
Subject: these classes need to inherit from BaseHubSystem, like all others here
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dfaaaf89f2f70281578cc177f75cd9976eee7f3b;p=hub.git
these classes need to inherit from BaseHubSystem, like all others here
except StorableSocket
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/application/hub/classes/class_ b/application/hub/classes/class_
index 2dea4bd38..6cad45e03 100644
--- a/application/hub/classes/class_
+++ b/application/hub/classes/class_
@@ -1,4 +1,10 @@
<?php
+// Own namespace
+namespace Hub\;
+
+// Import application-specific stuff
+use Hub\Generic\BaseHubSystem;
+
/**
* A ???
*
@@ -21,7 +27,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-class ??? extends BaseFrameworkSystem implements === {
+class ??? extends BaseHubSystem implements === {
/**
* Protected constructor
*
diff --git a/application/hub/classes/cruncher/class_BaseHubCruncher.php b/application/hub/classes/cruncher/class_BaseHubCruncher.php
index 9c3023760..b5b8abd18 100644
--- a/application/hub/classes/cruncher/class_BaseHubCruncher.php
+++ b/application/hub/classes/cruncher/class_BaseHubCruncher.php
@@ -8,7 +8,6 @@ use Hub\Generic\BaseHubSystem;
// Import framework stuff
use CoreFramework\Database\Updateable;
use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registry;
/**
diff --git a/application/hub/classes/helper/messages/class_BaseMessageHelper.php b/application/hub/classes/helper/messages/class_BaseMessageHelper.php
index 8f26b37fb..214561350 100644
--- a/application/hub/classes/helper/messages/class_BaseMessageHelper.php
+++ b/application/hub/classes/helper/messages/class_BaseMessageHelper.php
@@ -2,8 +2,8 @@
// Own namespace
namespace Hub\Helper\Message;
-// Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
+// Import application-specific stuff
+use Hub\Generic\BaseHubSystem;
/**
* A general Message class
@@ -27,7 +27,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-class BaseMessageHelper extends BaseFrameworkSystem {
+class BaseMessageHelper extends BaseHubSystem {
/**
* Protected constructor
*
@@ -38,7 +38,5 @@ class BaseMessageHelper extends BaseFrameworkSystem {
// Call parent constructor
parent::__construct($className);
}
-}
-// [EOF]
-?>
+}
diff --git a/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php b/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php
index 5a362fb56..b0ab1a5be 100644
--- a/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php
+++ b/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php
@@ -2,8 +2,8 @@
// Own namespace
namespace Hub\Helper\WorkUnit;
-// Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
+// Import application-specific stuff
+use Hub\Generic\BaseHubSystem;
/**
* A general WorkUnit class
@@ -27,7 +27,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-abstract class BaseWorkUnitHelper extends BaseFrameworkSystem {
+abstract class BaseWorkUnitHelper extends BaseHubSystem {
/**
* Protected constructor
*
diff --git a/application/hub/classes/miner/class_BaseHubMiner.php b/application/hub/classes/miner/class_BaseHubMiner.php
index adedc5b56..2114c55df 100644
--- a/application/hub/classes/miner/class_BaseHubMiner.php
+++ b/application/hub/classes/miner/class_BaseHubMiner.php
@@ -8,7 +8,6 @@ use Hub\Generic\BaseHubSystem;
// Import framework stuff
use CoreFramework\Database\Updateable;
use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registry;
/**
diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index e873f212d..d3282002d 100644
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -19,7 +19,6 @@ use CoreFramework\Criteria\Storing\StoreableCriteria;
use CoreFramework\Database\Updateable;
use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registry;
use CoreFramework\Request\Requestable;
use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php
index 96e06b95c..59b8a0699 100644
--- a/application/hub/classes/producer/class_BaseProducer.php
+++ b/application/hub/classes/producer/class_BaseProducer.php
@@ -2,9 +2,11 @@
// Own namespace
namespace Hub\Producer;
+// Import application-specific stuff
+use Hub\Generic\BaseHubSystem;
+
// Import framework stuff
use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
use CoreFramework\Registry\Registry;
/**
@@ -29,7 +31,7 @@ use CoreFramework\Registry\Registry;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-abstract class BaseProducer extends BaseFrameworkSystem {
+abstract class BaseProducer extends BaseHubSystem {
/**
* Outgoing work-queue
*/
diff --git a/application/hub/classes/unl/class_UniversalNodeLocator.php b/application/hub/classes/unl/class_UniversalNodeLocator.php
index e44d88276..861805087 100644
--- a/application/hub/classes/unl/class_UniversalNodeLocator.php
+++ b/application/hub/classes/unl/class_UniversalNodeLocator.php
@@ -4,12 +4,10 @@ namespace Hub\Locator\Node;
// Import application-specific stuff
use Hub\Database\Frontend\Node\Information\NodeInformationDatabaseWrapper;
-
-// Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
+use Hub\Generic\BaseHubSystem;
/**
- * A UniversalNodeLocator
+ * A class for UNLs (Universal Node Locator)
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
@@ -30,7 +28,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-class UniversalNodeLocator extends BaseFrameworkSystem implements LocateableNode {
+class UniversalNodeLocator extends BaseHubSystem implements LocateableNode {
//------- UNL parts -------
// Protocol
const UNL_PART_PROTOCOL = 'protocol';
diff --git a/application/hub/interfaces/container/socket/class_StorableSocket.php b/application/hub/interfaces/container/socket/class_StorableSocket.php
index 81c21725f..2833ce2a0 100644
--- a/application/hub/interfaces/container/socket/class_StorableSocket.php
+++ b/application/hub/interfaces/container/socket/class_StorableSocket.php
@@ -2,8 +2,8 @@
// Own namespace
namespace Hub\Container\Socket;
-// Import application-specific stuff
-use Hub\Generic\HubInterface;
+// Inport frameworks stuff
+use CoreFramework\Generic\FrameworkInterface;
/**
* An interface for socket containers
@@ -27,7 +27,7 @@ use Hub\Generic\HubInterface;
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-interface StorableSocket extends HubInterface {
+interface StorableSocket extends FrameworkInterface {
/**
* Checks whether the given Universal Node Locator matches with the one from package data