From 3cf393f0a666f7d8d4f752fcada5f4fa16c1a3bc Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 29 Jul 2015 22:04:14 +0200 Subject: [PATCH] Renamed more classes and interfaces to sections as they actually handled. Signed-off-by: Roland Haeder --- application/city/config.php | 4 ++-- .../manager/{city_map => city_sections}/.htaccess | 0 .../class_ManageableCitySections.php} | 4 ++-- .../city/main/city_daemon/class_BaseCityDaemon.php | 4 ++-- .../main/manager/{city_map => city_sections}/.htaccess | 0 .../class_CitySectionsManager.php} | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) rename application/city/interfaces/manager/{city_map => city_sections}/.htaccess (100%) rename application/city/interfaces/manager/{city_map/class_ManageableCityMap.php => city_sections/class_ManageableCitySections.php} (91%) rename application/city/main/manager/{city_map => city_sections}/.htaccess (100%) rename application/city/main/manager/{city_map/class_CityMapManager.php => city_sections/class_CitySectionsManager.php} (84%) diff --git a/application/city/config.php b/application/city/config.php index aea8d54..15a5266 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -482,8 +482,8 @@ $cfg->setConfigEntry('login_type', 'username'); // CFG: CITY-MANAGER-CLASS $cfg->setConfigEntry('city_manager_class', 'CityManager'); -// CFG: CITY-MAP-MANAGER-CLASS -$cfg->setConfigEntry('city_map_manager_class', 'CityMapManager'); +// CFG: CITY-SECTIONS-MANAGER-CLASS +$cfg->setConfigEntry('city_sections_manager_class', 'CitySectionsManager'); // CFG: REGION-MANAGER-CLASS $cfg->setConfigEntry('region_manager_class', 'RegionManager'); diff --git a/application/city/interfaces/manager/city_map/.htaccess b/application/city/interfaces/manager/city_sections/.htaccess similarity index 100% rename from application/city/interfaces/manager/city_map/.htaccess rename to application/city/interfaces/manager/city_sections/.htaccess diff --git a/application/city/interfaces/manager/city_map/class_ManageableCityMap.php b/application/city/interfaces/manager/city_sections/class_ManageableCitySections.php similarity index 91% rename from application/city/interfaces/manager/city_map/class_ManageableCityMap.php rename to application/city/interfaces/manager/city_sections/class_ManageableCitySections.php index dc7172c..7251669 100644 --- a/application/city/interfaces/manager/city_map/class_ManageableCityMap.php +++ b/application/city/interfaces/manager/city_sections/class_ManageableCitySections.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface ManageableCityMap extends FrameworkInterface { +interface ManageableCitySections extends FrameworkInterface { /** * Checks whether at least one map requires expansion * diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php index 46d666d..f477a1a 100644 --- a/application/city/main/city_daemon/class_BaseCityDaemon.php +++ b/application/city/main/city_daemon/class_BaseCityDaemon.php @@ -256,8 +256,8 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter * @return $requiresExpansion Whether a map requires expansion */ public function isMapPendingExpansion () { - // Get map manager - $mapInstance = ManagerFactory::createManagerByType('city_map'); + // Get sections manager + $mapInstance = ManagerFactory::createManagerByType('city_sections'); // Call it's method and return value return $mapInstance->isMapPendingExpansion(); diff --git a/application/city/main/manager/city_map/.htaccess b/application/city/main/manager/city_sections/.htaccess similarity index 100% rename from application/city/main/manager/city_map/.htaccess rename to application/city/main/manager/city_sections/.htaccess diff --git a/application/city/main/manager/city_map/class_CityMapManager.php b/application/city/main/manager/city_sections/class_CitySectionsManager.php similarity index 84% rename from application/city/main/manager/city_map/class_CityMapManager.php rename to application/city/main/manager/city_sections/class_CitySectionsManager.php index 43f5438..fd1106d 100644 --- a/application/city/main/manager/city_map/class_CityMapManager.php +++ b/application/city/main/manager/city_sections/class_CitySectionsManager.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityMapManager extends BaseFrameworkSystem implements ManageableCityMap, Registerable { +class CitySectionsManager extends BaseFrameworkSystem implements ManageableCitySections, Registerable { /** * Protected constructor * @@ -35,11 +35,11 @@ class CityMapManager extends BaseFrameworkSystem implements ManageableCityMap, R /** * Creates an instance of this class * - * @return $managerInstance An instance of a ManageableCityMap class + * @return $managerInstance An instance of a ManageableCitySections class */ - public final static function createCityMapManager () { + public final static function createCitySectionsManager () { // Get new instance - $managerInstance = new CityMapManager(); + $managerInstance = new CitySectionsManager(); // Get database wrapper $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_sections_db_wrapper_class'); -- 2.39.5