From 4b5300bc90a764fb235c1f55aced07a9097ef335 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 18:19:17 +0100 Subject: [PATCH] Continued: - Moved classes from wrapper to database/frontend - Removed BaseSate class as this now is in 'core' - Updated 'core' to latest commit Signed-off-by: Roland Haeder --- .../{wrapper => database}/.htaccess | 0 .../interfaces/database/frontend/.htaccess | 1 + .../frontend}/class_NodeDhtWrapper.php | 0 .../class_NodeInformationWrapper.php | 0 .../frontend}/class_UnitDatabaseWrapper.php | 0 application/hub/main/states/class_ | 40 ---------- .../hub/main/states/class_BaseState.php | 77 ------------------- core | 2 +- 8 files changed, 2 insertions(+), 118 deletions(-) rename application/hub/interfaces/{wrapper => database}/.htaccess (100%) create mode 100644 application/hub/interfaces/database/frontend/.htaccess rename application/hub/interfaces/{wrapper => database/frontend}/class_NodeDhtWrapper.php (100%) rename application/hub/interfaces/{wrapper => database/frontend}/class_NodeInformationWrapper.php (100%) rename application/hub/interfaces/{wrapper => database/frontend}/class_UnitDatabaseWrapper.php (100%) delete mode 100644 application/hub/main/states/class_ delete mode 100644 application/hub/main/states/class_BaseState.php diff --git a/application/hub/interfaces/wrapper/.htaccess b/application/hub/interfaces/database/.htaccess similarity index 100% rename from application/hub/interfaces/wrapper/.htaccess rename to application/hub/interfaces/database/.htaccess diff --git a/application/hub/interfaces/database/frontend/.htaccess b/application/hub/interfaces/database/frontend/.htaccess new file mode 100644 index 000000000..3a4288278 --- /dev/null +++ b/application/hub/interfaces/database/frontend/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/hub/interfaces/wrapper/class_NodeDhtWrapper.php b/application/hub/interfaces/database/frontend/class_NodeDhtWrapper.php similarity index 100% rename from application/hub/interfaces/wrapper/class_NodeDhtWrapper.php rename to application/hub/interfaces/database/frontend/class_NodeDhtWrapper.php diff --git a/application/hub/interfaces/wrapper/class_NodeInformationWrapper.php b/application/hub/interfaces/database/frontend/class_NodeInformationWrapper.php similarity index 100% rename from application/hub/interfaces/wrapper/class_NodeInformationWrapper.php rename to application/hub/interfaces/database/frontend/class_NodeInformationWrapper.php diff --git a/application/hub/interfaces/wrapper/class_UnitDatabaseWrapper.php b/application/hub/interfaces/database/frontend/class_UnitDatabaseWrapper.php similarity index 100% rename from application/hub/interfaces/wrapper/class_UnitDatabaseWrapper.php rename to application/hub/interfaces/database/frontend/class_UnitDatabaseWrapper.php diff --git a/application/hub/main/states/class_ b/application/hub/main/states/class_ deleted file mode 100644 index a64903978..000000000 --- a/application/hub/main/states/class_ +++ /dev/null @@ -1,40 +0,0 @@ - - * @version 0.0.0 - * @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 - * - * 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 . - */ -class ???State extends BaseState implements ??Stateable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - - // Set state name - $this->setStateName('!!!'); - } -} - -// [EOF] -?> diff --git a/application/hub/main/states/class_BaseState.php b/application/hub/main/states/class_BaseState.php deleted file mode 100644 index 2feff48d2..000000000 --- a/application/hub/main/states/class_BaseState.php +++ /dev/null @@ -1,77 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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 . - */ -class BaseState extends BaseHubSystem implements Stateable { - // Exception code constants - const EXCEPTION_INVALID_STATE = 0xc00; - - /** - * State name for printing out (except debug output where you want to use - * $stateInstance->__toString() instead of this). - */ - private $stateName = ''; - - /** - * Protected constructor - * - * @param $className Name of the class - * @return void - */ - protected function __construct ($className) { - // Call parent constructor - parent::__construct($className); - } - - /** - * Getter for state name - * - * @return $stateName Name of this state in a printable maner - */ - public final function getStateName () { - return $this->stateName; - } - - /** - * Setter for state name - * - * @param $stateName Name of this state in a printable maner - * @return void - */ - protected final function setStateName ($stateName) { - $this->stateName = $stateName; - } - - /** - * Executes the state with given Executor instance - * - * @param $executorInstance An instance of a Executor class - * @return void - * @throws UnsupportedOperationException This method should be overwritten - */ - public function executeState (Executor $executorInstance) { - throw new UnsupportedOperationException(array($this, __FUNCTION__, $executorInstance), self::EXCEPTION_UNSPPORTED_OPERATION); - } -} - -// [EOF] -?> diff --git a/core b/core index 87b2be57b..c0922d6cc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 87b2be57b63b6e923aab40e0fbba2ff86db88a86 +Subproject commit c0922d6cccd0fb0f1b5221585748e92d02ad1cee -- 2.39.5