From: Roland Haeder <roland@mxchange.org>
Date: Mon, 29 Jun 2015 00:06:50 +0000 (+0200)
Subject: Renamed method, added missing config + expanded debug line a bit.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c7c0f9fd2aa0d52a3f11d73f1fa5dcffbbf622d;p=city.git

Renamed method, added missing config + expanded debug line a bit.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/application/city/config.php b/application/city/config.php
index ab67804..9a3e9b2 100644
--- a/application/city/config.php
+++ b/application/city/config.php
@@ -55,6 +55,9 @@ $cfg->setConfigEntry('city_init_state_class', 'CityInitState');
 // CFG: CITY-VIRGIN-STATE-CLASS
 $cfg->setConfigEntry('city_virgin_state_class', 'CityVirginState');
 
+// CFG: CITY-ACTIVE-STATE-CLASS
+$cfg->setConfigEntry('city_active_state_class', 'CityActiveState');
+
 /******************************************************************************
  *                                HTML client                                 *
  ******************************************************************************/
diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php
index 8735bbb..51abb5c 100644
--- a/application/city/main/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/main/city_daemon/class_BaseCityDaemon.php
@@ -182,8 +182,8 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
 		$this->getStateInstance()->validateCityStateIsVirgin();
 
 		// ----------------------- Last step from here ------------------------
-		// Activate the City. This is ALWAYS the last step in this method
-		/* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString());
+		// Activate the city daemon. This is ALWAYS the last step in this method
+		/* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString() . ' - Activating ...');
 		$this->getStateInstance()->citySimulationIsActivated();
 		// ---------------------- Last step until here ------------------------
 	}
diff --git a/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
index bf6fff1..31f2848 100644
--- a/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -71,9 +71,7 @@ class CityDaemonTaskHandlerInitializerFilter extends BaseCityFilter implements F
 		$handlerInstance->registerTask('map_expander', $taskInstance);
 
 		/*
-		 * Allow extra city-depending tasks, e.g. the bootstrapper city needs
-		 * booting its DHT. DHTs are decentralized and are working on
-		 * peer-to-peer basis.
+		 * Add extra tasks depending on daemon modus.
 		 */
 		$cityInstance->addExtraTasks($handlerInstance);
 	}
diff --git a/application/city/main/states/city/virgin/class_CityVirginState.php b/application/city/main/states/city/virgin/class_CityVirginState.php
index a86b73f..888b9d7 100644
--- a/application/city/main/states/city/virgin/class_CityVirginState.php
+++ b/application/city/main/states/city/virgin/class_CityVirginState.php
@@ -54,7 +54,7 @@ class CityVirginState extends BaseCityState implements Stateable {
 	 *
 	 * @return	void
 	 */
-	public function cityIsActivated () {
+	public function citySimulationIsActivated () {
 		// Create the new state instance
 		CityStateFactory::createCityStateInstanceByName('active');
 	}