From e94a08a38a4f157d3fb05e9400e36c3b77a40db8 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 29 Jun 2015 20:05:26 +0200 Subject: [PATCH] Let's get rid of 'virgin' state as it won't have any functionality. Signed-off-by: Roland Haeder --- .../main/city_daemon/class_BaseCityDaemon.php | 4 +- .../main/states/city/class_BaseCityState.php | 6 +- .../states/city/init/class_CityInitState.php | 9 +-- .../city/main/states/city/virgin/.htaccess | 1 - .../city/virgin/class_CityVirginState.php | 64 ------------------- 5 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 application/city/main/states/city/virgin/.htaccess delete mode 100644 application/city/main/states/city/virgin/class_CityVirginState.php diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php index 5f37722..99f470f 100644 --- a/application/city/main/city_daemon/class_BaseCityDaemon.php +++ b/application/city/main/city_daemon/class_BaseCityDaemon.php @@ -179,8 +179,8 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter // Run all filters for the City activation $controllerInstance->executeActivationFilters($requestInstance, $responseInstance); - // Make sure the city's state is 'virigin' - $this->getStateInstance()->validateCityStateIsVirgin(); + // Make sure the city's state is 'init' + $this->getStateInstance()->validateCityStateIsInit(); // ----------------------- Last step from here ------------------------ // Activate the city daemon. This is ALWAYS the last step in this method diff --git a/application/city/main/states/city/class_BaseCityState.php b/application/city/main/states/city/class_BaseCityState.php index 00a43b6..ad6f1e8 100644 --- a/application/city/main/states/city/class_BaseCityState.php +++ b/application/city/main/states/city/class_BaseCityState.php @@ -49,15 +49,15 @@ class BaseCityState extends BaseState { } /** - * Validates whether the state is 'virgin' or throws an exception if + * Validates whether the state is 'init' or throws an exception if * it is every other state. * * @return void * @throws UnexpectedStateException If the state is not 'virgin' */ - public function validateCityStateIsVirgin () { + public function validateCityStateIsInit () { // Just compare it... - if (!$this instanceof CityVirginState) { + if (!$this instanceof CityInitState) { // Throw the exception throw new UnexpectedStateException($this, self::EXCEPTION_INVALID_STATE); } // END - if diff --git a/application/city/main/states/city/init/class_CityInitState.php b/application/city/main/states/city/init/class_CityInitState.php index e5765b2..954e24a 100644 --- a/application/city/main/states/city/init/class_CityInitState.php +++ b/application/city/main/states/city/init/class_CityInitState.php @@ -60,13 +60,14 @@ class CityInitState extends BaseCityState implements Stateable { } /** - * The daemon has been fully initialized so change the state to 'virgin'. + * Change the state to 'active' when the city daemon has initialized all + * tasks, queues, etc. * * @return void */ - public function daemonHasInitialized () { - // Change the state now to 'virgin' - CityStateFactory::createCityStateInstanceByName('virgin'); + public function citySimulationIsActivated () { + // Create the new state instance + CityStateFactory::createCityStateInstanceByName('active'); } } diff --git a/application/city/main/states/city/virgin/.htaccess b/application/city/main/states/city/virgin/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/main/states/city/virgin/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/main/states/city/virgin/class_CityVirginState.php b/application/city/main/states/city/virgin/class_CityVirginState.php deleted file mode 100644 index 888b9d7..0000000 --- a/application/city/main/states/city/virgin/class_CityVirginState.php +++ /dev/null @@ -1,64 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2015 City 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 CityVirginState extends BaseCityState implements Stateable { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructo - parent::__construct(__CLASS__); - - // Set state name - $this->setStateName('virgin'); - } - - /** - * Creates an instance of this class - * - * @return $stateInstance An instance of a Stateable class - */ - public static final function createCityVirginState () { - // Get new instance - $stateInstance = new CityVirginState(); - - // Return the prepared instance - return $stateInstance; - } - - /** - * Change the state to 'active' when the city daemon has initialized all - * tasks, queues, etc. - * - * @return void - */ - public function citySimulationIsActivated () { - // Create the new state instance - CityStateFactory::createCityStateInstanceByName('active'); - } -} - -// [EOF] -?> -- 2.39.5