From 688528484dc207fbf011076d70c8a5c96454efad Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 18 Oct 2014 00:52:47 +0200 Subject: [PATCH] Removed deprecated stuff. Signed-off-by: Roland Haeder Conflicts: application/hub/interfaces/connectors/class_Connectable.php --- .../hub/interfaces/connectors/.htaccess | 1 - .../connectors/class_Connectable.php | 36 -------------- .../hub/main/nodes/class_BaseHubNode.php | 48 ------------------- 3 files changed, 85 deletions(-) delete mode 100644 application/hub/interfaces/connectors/.htaccess delete mode 100644 application/hub/interfaces/connectors/class_Connectable.php diff --git a/application/hub/interfaces/connectors/.htaccess b/application/hub/interfaces/connectors/.htaccess deleted file mode 100644 index 3a4288278..000000000 --- a/application/hub/interfaces/connectors/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/hub/interfaces/connectors/class_Connectable.php b/application/hub/interfaces/connectors/class_Connectable.php deleted file mode 100644 index b814d15f8..000000000 --- a/application/hub/interfaces/connectors/class_Connectable.php +++ /dev/null @@ -1,36 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team - * @license GNU GPL 3.0 or any newer version - * @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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -interface Connectable extends FrameworkInterface { - /** - * Handles all pending requests/what ever. This method should be called by - * the ActiveTaskVisitor class and should use an iterator on all pending - * requests/queries/queues. - * - * @return void - */ - function handlePending (); -} - -// [EOF] -?> diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index 3dd419d36..0094562c3 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -41,16 +41,6 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { */ private $bootIpPort = ''; - /** - * Query connector instance - */ - private $queryConnectorInstance = NULL; - - /** - * Queue connector instance - */ - private $queueConnectorInstance = NULL; - /** * Whether this node is anncounced (keep on FALSE!) * @deprecated @@ -154,44 +144,6 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Created new private key with hash: ' . $this->getPrivateKeyHash() . ''); } - /** - * Setter for query instance - * - * @param $connectorInstance Our new query instance - * @return void - */ - private final function setQueryConnectorInstance (Connectable $connectorInstance) { - $this->queryConnectorInstance = $connectorInstance; - } - - /** - * Getter for query instance - * - * @return $connectorInstance Our new query instance - */ - public final function getQueryConnectorInstance () { - return $this->queryConnectorInstance; - } - - /** - * Setter for queue instance - * - * @param $connectorInstance Our new queue instance - * @return void - */ - private final function setQueueConnectorInstance (Connectable $connectorInstance) { - $this->queueConnectorInstance = $connectorInstance; - } - - /** - * Getter for queue instance - * - * @return $connectorInstance Our new queue instance - */ - public final function getQueueConnectorInstance () { - return $this->queueConnectorInstance; - } - /** * Getter for boot IP/port combination * -- 2.39.5