]> git.mxchange.org Git - city.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Mon, 1 Jan 2018 07:13:20 +0000 (08:13 +0100)
committerRoland Häder <roland@mxchange.org>
Mon, 1 Jan 2018 07:13:20 +0000 (08:13 +0100)
- "imported" classes/interfaces
- getRequestInstance() is now moved to FrameworkBootstrap

Signed-off-by: Roland Häder <roland@mxchange.org>
70 files changed:
application/city/classes/actions/class_
application/city/classes/actions/class_BaseCityAction.php
application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php
application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php
application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php
application/city/classes/city_daemon/class_
application/city/classes/city_daemon/class_BaseCityDaemon.php
application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
application/city/classes/class_
application/city/classes/class_Base
application/city/classes/class_BaseCitySystem.php
application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
application/city/classes/commands/html/class_CityHtmlLoginCommand.php
application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php
application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php
application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php
application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseWrapper.php
application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
application/city/classes/factories/states/city/class_CityStateFactory.php
application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
application/city/classes/filter/city_daemon/class_CityDaemon
application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
application/city/classes/filter/class_
application/city/classes/filter/class_BaseCityFilter.php
application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
application/city/classes/login/class_CityGuestLogin.php
application/city/classes/login/class_CityUserLogin.php
application/city/classes/login/helper/class_CityLoginHelper.php
application/city/classes/manager/city/class_CityManager.php
application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
application/city/classes/manager/class_
application/city/classes/manager/class_BaseManager.php
application/city/classes/manager/game/class_GameManager.php
application/city/classes/manager/region/class_RegionManager.php
application/city/classes/manager/region/class_RegionMapManager.php
application/city/classes/registration/class_CityRegistration.php
application/city/classes/states/city/active/class_CityActiveState.php
application/city/classes/states/city/class_
application/city/classes/states/city/class_BaseCityState.php
application/city/classes/states/city/init/class_CityInitState.php
application/city/classes/tasks/class_BaseCityTask.php
application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
application/city/config.php
application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsWrapper.php
application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsWrapper.php
application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsWrapper.php
application/city/interfaces/database/frontend/game_options/class_CityGameOptionsWrapper.php
application/city/interfaces/database/frontend/region/class_RegionInformationWrapper.php
application/city/interfaces/database/frontend/region/class_RegionMapWrapper.php
application/city/interfaces/helper/city/class_CityHelper.php
core

index 5b633e84ffa633ccb3f140dfa7cdfcded18095d4..f1ebf1a4c925b62bd824e43776122d46ccc398c1 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Action;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 5384e9c8fac368d95c9bcbdcbf6a43707ed3ddf2..595c4d42513ccfe096cf25802399244be70c7096 100644 (file)
@@ -29,7 +29,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCityAction extends BaseAction {
+abstract class BaseCityAction extends BaseAction {
        /**
         * Protected constructor
         *
index edddc0f229d93ea20c6dcd4636cbbb7fbbd9a64c..29f89cbc4946cc60229a3fa9175efce7d97a9d97 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Action\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 227b36f52a8919d842143b27c8da44d1574f561e..82ea314617b88ca11d1c26628071205dc802f937 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Action\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 5ef2c4966557ae981311074ec8dc3bed1e3c3812..c48aa8f8cc5f6473defea83591c41ce2eb58bbd6 100644 (file)
@@ -5,6 +5,7 @@ namespace Org\Mxchange\City\Action\Login;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 9737fc82ca378d5e149a050f2114acbc7f324691..e3ce288ffe9fe52ff928ca7780881cae9a92cf16 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Action\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index f29a70008e6701e22c9b9159a6c2d91bbcb31aeb..a86daf49be59203879ad51786be1bc8a7fee4a21 100644 (file)
@@ -5,6 +5,7 @@ namespace Org\Mxchange\City\Action\Login;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 5199c259d795d9de04eff443270a4c34dc5bfa38..10dee4054582192af53a313503e22fe894be844c 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Action\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
index 8e70ece8bb36f4542db978ebae77d71e95c4ae91..c9184eb31ee01ee8f644ab39d9d232b6180e76d8 100644 (file)
@@ -2,11 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Simulation;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
index 9d7302a9b76d7ef44f6a316e6463bb8802bae5de..6efac6521f90bd13ee29f32404520424f68f9253 100644 (file)
@@ -2,13 +2,17 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon;
 
-// Import own stuff
+// Import application-specific stuff
+use Org\Mxchange\City\Factory\State\CityStateFactory;
 use Org\Mxchange\City\Generic\BaseCitySystem;
+use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Database\Updateable;
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
@@ -36,7 +40,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriteria {
+abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriteria {
        /**
         * City types
         */
@@ -99,7 +103,7 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
 
                // Output all lines
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
-               self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' daemon starting');
+               self::createDebugInstance(__CLASS__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting');
                self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015, 2016 City Developer Team');
                self::createDebugInstance(__CLASS__)->debugOutput(' ');
                self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
index 282015826695ab5d9cbd963a4b530cc11d528e65..a21b9d5fd0d3787f62c2b4b25ee4f106691bdf58 100644 (file)
@@ -2,13 +2,14 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Simulation;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
 use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
index 408811fcbbd2dcef25e59e49dcfc62ac69f6169a..69af380686c82bf89aa8c711d74fd7ca800728f1 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Generic\BaseCitySystem;
 
 /**
index 2b83c9828f353512472876182cde025924cce07a..a3c6bd4060abc809ab8e4ed14fb07ff6a631a76d 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Generic\BaseCitySystem;
 
 /**
@@ -27,7 +27,7 @@ use Org\Mxchange\City\Generic\BaseCitySystem;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class Base??? extends BaseCitySystem {
+abstract class Base??? extends BaseCitySystem {
        /**
         * Protected constructor
         *
index f44083aa3aafe53aca1b293721c850a03e9930de..084a71621452466fa861097b2a2bada54631329d 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Generic;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
@@ -30,7 +30,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCitySystem extends BaseFrameworkSystem {
+abstract class BaseCitySystem extends BaseFrameworkSystem {
        // Exception codes
        const EXCEPTION_UNSUPPORTED_ERROR_HANDLER     = 0x900;
        const EXCEPTION_BASE64_ENCODING_NOT_MODULO_4  = 0x901;
index 32625752e276a09f25eb0f30ba33ec430e434dd3..f2e006bac623bd1ba232d0c10beda6b959c519ab 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Command;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 // Import framework stuff
index 6ecbf2919e2ff40387b45edd7abc67b1f5729c5f..a34721715e7512c8838be8481715f1085640f84c 100644 (file)
@@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Command;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
index 8db2bbb65cc6aa831487ea652a2fbd8670f6e9ef..96542933cbd96f7e59fc7d7f1b91f90b7a1f50b0 100644 (file)
@@ -2,12 +2,14 @@
 // Own namespace
 namespace Org\Mxchange\City\Database\Frontend\Information;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
 use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
index 0ebb871aa4f32976e62fd194e38b6a7d73a318b6..b7722a603f5266bfaadadf8b57e28cd14348efbd 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Database\Frontend\Districts;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A database wrapper for city districts
index f615df589b78d3f6e05504405e7c0e9183a5917a..9f071579ae8983726d8d40285d3b7dd35cafa702 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Database\Frontend\Lots;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A database wrapper for city lots
index 604cf46b9bf406a42ed59f314332a45be2a7b070..c7a07c30cdc03aee3f15018d3b7783ab51f4ab73 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Database\Frontend\Sections;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A database wrapper for city sections. Sections are the smalles entity of a
index 9eb329490e22d4c13d5133900aa7979c10dc5052..4250491220fae4b8f699db9f60b96840f50bd71c 100644 (file)
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\GameOptions;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+
 /**
  * A database wrapper for game options
  *
index e51bf14801f7360dc8330ef11e28d24ccf321ea1..6a4581a6110b496fd8eca224164d8e7016dca4e6 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Database\Frontend\RegionInformation;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
index b8fa671f15ce2d5c17e91cb66eab8de900b5589b..2c15ad571a86421ce269daf5d439cdcc8a262339 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Database\Frontend\Region;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
index fd760976decc811128c1caa28d24e149231c2c48..bcab149b30224226833a725ec8b88a9b07da71e0 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Factory\State;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 // Import framework stuff
index cc8827b5f7bdca861d4b9bb7b3eda47f6eb2d0a8..ca6046261967df9d083c805c49c1d70d3763550f 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index a9c90133faaf4c753641984fa6b71593d49e5a96..50b8aa61b51255bf24d12487db5c7240cff3eb35 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index c31cbc4d4b9b91536a5abc5c0b7e5f9e208a4bc1..6c9a3ab12a2f968735e9c7091158034ca503d73c 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index 55024093769c13dc1e4fc7c2521e2b5b06186cd7..80eaa2af2235f0c2828d9993155fbd52f46ef0b0 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index e6d9538794b95468c82210064696d0ff98c04bf1..52c414415c3b986c326c78bc31bf9ac7fe94b47e 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index 58d8960e6567e8459f254ae94c69e1581db88676..f0f9c2b85678b89e1bf5ae3eeb490533c7fc7a05 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Initialization;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index d93c5cfb8d9f7dc91e2116141461a8a982a6e6fd..35b12f5264d3795a80888e95f67d6b59930b53d5 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index ba17da8c53859fabf906aefe9a24b79bd5959831..de8531e277eb23421536b13234302fb9b2c51bbb 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index 1f26eb1d7778c2adb9b07339a0bc8f0c68cd694f..ef289471d4ffb76fabb73a180215ac745181303e 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\!!!\Filter;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index 0e22c1597cb40550e081f7d16e805371e5afe39b..2c9948638e1c9993388f10f3754b55086f93eb90 100644 (file)
@@ -29,7 +29,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCityFilter extends BaseFilter {
+abstract class BaseCityFilter extends BaseFilter {
        /**
         * Array with all data XML nodes (which hold the actual data) and their values
         */
index 5a7cdc0d5545a49eecfcc8f546c36b557fd5649f..59333c9e801f2224d1dfc986feaba1fc74adc694 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index 72e5d1e72f82c445f997c50a9f95a9a933699b76..ed37106ff442dc729e79b49a376414365eeaa4a5 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index d61e4a0dec8ae001f84430d31cb3069d5a3abe03..0edc4bcae66967884c9f16f629da089363352121 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
index 1ad38dfd772a83dd63c49d2c40835828731d9656..8e73df199d68df78b642d7b5b046ca6492b0c543 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Initialization\Tasks;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
index c2ab884aaf9c9f76e4f58b182fc917d5546b8c8a..816badce68e3e0b3687312e275e2b97554e2230e 100644 (file)
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Mxchange\City\Filter\Verifier;
 
+// Import application-specific stuff
+use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
index 3ec12fcc6cce77e785f9d76b02ce3094415d45f5..fe6f90b8c674b6e919e44db1e68892b723eb8310 100644 (file)
@@ -5,6 +5,8 @@ namespace Org\Mxchange\City\Login\Guest;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -126,12 +128,12 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis
         */
        public function encryptPassword ($requestKey) {
                // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
+               if (FrameworkBootstrap::getRequestInstance()->isRequestElementSet($requestKey)) {
                        // So encrypt the password and store it for later usage in
                        // the request:
 
                        // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+                       $plainPassword = FrameworkBootstrap::getRequestInstance()->getRequestElement($requestKey);
 
                        // Get user instance
                        $userInstance = Registry::getRegistry()->getInstance('user');
@@ -140,7 +142,7 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis
                        $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
 
                        // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
                } // END - if
        }
 }
index 7ab7f2d96e5db737f2b2e463d0f08d41a96e3ef2..7a68588f2ba0635ae5c0f3fd8dc7e3db9e93b14a 100644 (file)
@@ -3,8 +3,10 @@
 namespace Org\Mxchange\City\Login\User;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -135,12 +137,12 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist
         */
        public function encryptPassword ($requestKey) {
                // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
+               if (FrameworkBootstrap::getRequestInstance()->isRequestElementSet($requestKey)) {
                        // So encrypt the password and store it for later usage in
                        // the request:
 
                        // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+                       $plainPassword = FrameworkBootstrap::getRequestInstance()->getRequestElement($requestKey);
 
                        // Get user instance
                        $userInstance = Registry::getRegistry()->getInstance('user');
@@ -149,7 +151,7 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist
                        $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
 
                        // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
                } // END - if
        }
 }
index 0a8b33c005087e14d9e89bd5af6f398807e3c3f5..632280a3ea382992e9ce9b1a4b26f27c4196cc08 100644 (file)
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Helper\Login;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
@@ -108,10 +109,10 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
                $loginInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
 
                // Set user cookie
-               $loginInstance->setUserAuth($this->getRequestInstance()->getRequestElement('username'));
+               $loginInstance->setUserAuth(FrameworkBootstrap::getRequestInstance()->getRequestElement('username'));
 
                // Set password cookie
-               $loginInstance->setPasswordAuth($this->getRequestInstance()->getRequestElement('pass_hash'));
+               $loginInstance->setPasswordAuth(FrameworkBootstrap::getRequestInstance()->getRequestElement('pass_hash'));
 
                // Remember this login instance for later usage
                Registry::getRegistry()->addInstance('login', $loginInstance);
index eb045a81c24d1dd05593e49528dfbf978df6ec90..208a356febfd61ecd32c82635d2d8bd8808e3914 100644 (file)
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Manager\City;
 
+// Import application-specific stuff
+use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -92,11 +97,11 @@ class CityManager extends BaseManager implements ManageableCity {
         */
        public function foundFirstCity () {
                // Check on request instance and 'city_name' element
-               assert($this->getRequestInstance() instanceof Requestable);
-               assert($this->getRequestInstance()->isRequestElementSet(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME));
+               assert(FrameworkBootstrap::getRequestInstance() instanceof Requestable);
+               assert(FrameworkBootstrap::getRequestInstance()->isRequestElementSet(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME));
 
                // Get city name
-               $cityName = $this->getRequestInstance()->getRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME);
+               $cityName = FrameworkBootstrap::getRequestInstance()->getRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME);
 
                // Some pre-checks
                assert(!$this->isCityAlreadyFounded());
@@ -116,10 +121,10 @@ class CityManager extends BaseManager implements ManageableCity {
                $regionData = $regionResultInstance->current();
 
                // Add region id from it
-               $this->getRequestInstance()->setRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_REGION_ID, $regionData[RegionInformationDatabaseWrapper::DB_COLUMN_REGION_ID]);
+               FrameworkBootstrap::getRequestInstance()->setRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_REGION_ID, $regionData[RegionInformationDatabaseWrapper::DB_COLUMN_REGION_ID]);
 
                // Then create the first city
-               $this->getWrapperInstance()->createCityByRequest($this->getRequestInstance());
+               $this->getWrapperInstance()->createCityByRequest(FrameworkBootstrap::getRequestInstance());
        }
 
        /**
index 63147d6197e6697ffc834354d88f8090dc574f5b..d308d42cb2280143fa934267a5f02523a4c69575 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Manager\District;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A city districts manager
index 3650cc252c09aba65d8050ef3ff88d7872ff155d..55cbbcb0182c6c4852f59167d7e0101645be3235 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Manager\Lots;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A city lots manager
index 903d8377b25f620c852595a209554d4520bfae83..a04b8a3e309bddef22b30c950de4965efc13d5fa 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Manager\Sections;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A city sections manager
index 880f5862a11b890777d4a6267a629cfafff32b49..a8cb29298c8fff7cb4cf91bbfcf4c9e48a453e2f 100644 (file)
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Manager\;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A ??? manager
index 7ceaa1326af895075d81cbbc42fddb7ec3960bd8..4fc07fa87a2af53ed9de2349085077250c642fb2 100644 (file)
@@ -2,9 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Manager;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Generic\BaseCitySystem;
 
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+
 /**
  * A general Manager class
  *
@@ -27,7 +30,7 @@ use Org\Mxchange\City\Generic\BaseCitySystem;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseManager extends BaseCitySystem implements Manageable, Registerable {
+abstract class BaseManager extends BaseCitySystem implements Manageable, Registerable {
        /**
         * Protected constructor
         *
index 6fa4849ddf534fb82dfc70c5b6317badc2ecb49f..6427001ca8765df0153de61cc915b499308c9369 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Region;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
+
 /**
  * A game manager
  *
index 76e4a875f726e5413ae460c48a188e6f93a0829f..1872cf507202544f3cff58e03255ce27195a133e 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Region;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
+
 /**
  * A Region manager
  *
index 98817f265cb7cc647558afcaaba0f26379b77441..9b894cb66b8ffe9d50336f0528eb4940b5225159 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\RegionMap;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
+
 /**
  * A region map manager
  *
index f20f9ebed3df77514f4b62f7d3ddff272861df83..b9fc81518048c3f78c8cbbee7a47f64217b0d13b 100644 (file)
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Registration;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
@@ -92,18 +94,18 @@ class CityRegistration extends BaseRegistration implements UserRegister {
         */
        public function encryptPassword ($requestKey) {
                // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
+               if (FrameworkBootstrap::getRequestInstance()->isRequestElementSet($requestKey)) {
                        // So encrypt the password and store it for later usage in
                        // the request:
 
                        // 1.: Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+                       $plainPassword = FrameworkBootstrap::getRequestInstance()->getRequestElement($requestKey);
 
                        // 2. Get a crypto helper and hash the password
                        $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword);
 
                        // 3. Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
                }
        }
 
@@ -157,7 +159,7 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                $actionInstance = ObjectFactory::createObjectByConfiguredName('post_registration_class');
 
                // Execute the action
-               $actionInstance->execute($this->getRequestInstance(), $this->getResponseInstance());
+               $actionInstance->execute(FrameworkBootstrap::getRequestInstance(), $this->getResponseInstance());
        }
 
        /**
@@ -182,20 +184,20 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                        // Do we have an alias?
                        if (is_string($alias)) {
                                // Yes, so use it
-                               $criteriaInstance->addCriteria($alias, $this->getRequestInstance()->getRequestElement($element));
+                               $criteriaInstance->addCriteria($alias, FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
 
                                // Debug message
-                               //* DEBUG: */ $this->debugOutput('ALIAS: alias='.$alias.',element='.$element.'='.$this->getRequestInstance()->getRequestElement($element));
+                               //* DEBUG: */ $this->debugOutput('ALIAS: alias='.$alias.',element='.$element.'='.FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
                        } else {
                                // No, default entry
-                               $criteriaInstance->addCriteria($element, $this->getRequestInstance()->getRequestElement($element));
+                               $criteriaInstance->addCriteria($element, FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
 
                                // Debug message
-                               //* DEBUG: */ $this->debugOutput('DEFAULT: element='.$element.'='.$this->getRequestInstance()->getRequestElement($element));
+                               //* DEBUG: */ $this->debugOutput('DEFAULT: element='.$element.'='.FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
                        }
 
                        // Is this a guest account?
-                       if ((($element == 'username') || ($alias == 'username')) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) {
+                       if ((($element == 'username') || ($alias == 'username')) && (FrameworkBootstrap::getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) {
                                // Yes, then set the config entry to guest status
                                $configEntry = 'user_status_guest';
                        } // END - if
index 56a78214462c314904c3d38fdc189ae531003f1c..22ac35ebaf3124503969bf623be434b5baa1413c 100644 (file)
@@ -2,8 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\State\Active;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\State\BaseCityState;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\State\Stateable;
 
 /**
  * A active city state class
index a81ff3424943efb23f2e67dc754ef78589521fa9..333ef1ec52c012701d37c822365c5221c2fa75af 100644 (file)
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\State\???;
+
+// Import application-specific stuff
+use Org\Mxchange\City\State\BaseCityState;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\State\Stateable;
+
 /**
  * A ??? city state class
  *
index 56e57cb1cdd61a27ef91f357ac9b616c80f2722c..11e8dd6ae706ff75b3e0d76c8552631ede8cce0d 100644 (file)
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\State;
+
+// Import application-specific stuff
+use Org\Mxchange\City\State\Init\CityInitState;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\State\BaseState;
+
 /**
  * A general city state class
  *
@@ -21,7 +30,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCityState extends BaseState {
+abstract class BaseCityState extends BaseState {
        /**
         * Protected constructor
         *
index 32ec04bfe54c7aa95200a0201e5308a455ff8762..fe74f656fec5cb79cc02b9fb47957d3e66cdf0a6 100644 (file)
@@ -1,4 +1,15 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\State\Init;
+
+// Import application-specific stuff
+use Org\Mxchange\City\Factory\State\CityStateFactory;
+use Org\Mxchange\City\State\BaseCityState;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Executor\Executor;
+use Org\Mxchange\CoreFramework\State\Stateable;
+
 /**
  * A init city state class
  *
index edca046947dea3c845756ecdd8c6d27e3347d204..b61c2ea6064487f4a2f71cd3e3767484dd5c5ae4 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Task;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Helper\CityHelper;
 
 /**
@@ -27,7 +27,7 @@ use Org\Mxchange\City\Helper\CityHelper;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseCityTask extends BaseTask {
+abstract class BaseCityTask extends BaseTask {
        /**
         * An instance of a city
         */
index 084dbc5fb32ed526e21ad4861cc187114d06509f..0a0a81726eefcb689224b6c051661867da1e8cc7 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Task\Growth\Building;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 /**
index 2b25dd203550dc3823df41f4d9937782abdf7c99..646d0ce705453a5e130e170e6a85d8ffb2f3e00f 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Task\Growth\Household;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 /**
index d5b29a379afcc961553c787585e4cfe835f66568..13c6666e0f4ba33d7658600dddd3daff9042ad33 100644 (file)
@@ -2,7 +2,7 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Task\Expander\Map;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 /**
index ff7bb46bd92cdc4758363fb7439c3142a3460a06..30e847054989a87ce68c93dc9798d8a5d1e0e0ce 100644 (file)
@@ -44,7 +44,7 @@ $cfg->setConfigEntry('news_process_filter', 'Org\Mxchange\CoreFramework\Filter\N
 $cfg->setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');
 
 // CFG: CITY-INFO-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('city_info_db_wrapper_class', 'CityInformationDatabaseWrapper');
+$cfg->setConfigEntry('city_info_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper');
 
 // CFG: REGION-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('region_info_db_wrapper_class', 'RegionInformationDatabaseWrapper');
@@ -65,13 +65,13 @@ $cfg->setConfigEntry('city_lots_db_wrapper_class', 'CityLotsDatabaseWrapper');
 $cfg->setConfigEntry('city_districts_db_wrapper_class', 'CityDistrictsDatabaseWrapper');
 
 // CFG: CITY-INIT-STATE-CLASS
-$cfg->setConfigEntry('city_init_state_class', 'CityInitState');
+$cfg->setConfigEntry('city_init_state_class', 'Org\Mxchange\City\State\Init\CityInitState');
 
 // CFG: CITY-VIRGIN-STATE-CLASS
-$cfg->setConfigEntry('city_virgin_state_class', 'CityVirginState');
+$cfg->setConfigEntry('city_virgin_state_class', 'Org\Mxchange\City\State\Virgin\CityVirginState');
 
 // CFG: CITY-ACTIVE-STATE-CLASS
-$cfg->setConfigEntry('city_active_state_class', 'CityActiveState');
+$cfg->setConfigEntry('city_active_state_class', 'Org\Mxchange\City\State\Active\CityActiveState');
 
 /******************************************************************************
  *                                HTML client                                 *
index 74d85cceb0501801b3e152f6cc11b0ae543f9486..2de42b2cfe91028540c05c9101b14937e8679bb5 100644 (file)
@@ -2,11 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Database\Frontend\Information;
 
-// Import own stuff
+// Import application-specific stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
 use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
index 9852f2f2886d4fa2d14f46fa5bdbc328ad37ef5b..510bab28c9cf6de911b7a09f9b71021c22cca329 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\Districts;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for city districts (database) wrapper
  *
index a053c7e020e35268257723960a54e8770f90b5a9..93760a6e44fe1522d198bc24d9f7598c267b431e 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\Lots;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for city lots (database) wrapper
  *
index 1587515c2705fff28c19a627e90a10c4ff648fd8..3d2c24ddad38e380c9f9b435de51ab3d9bf77579 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\Sections;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for city sections (database) wrapper
  *
index 5be016420a1e2ce728fa0eb64b135924d7fdf07e..8734facd4167ef2736f8e80b09d41dc8fe959791 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\GameOptions;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for game options (database) wrapper
  *
index f605e0dedc03c385f9e55e626ce8e6935587f72a..5ee864602db074f3396ea78aadffdf31e710b165 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\Information\Region;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for region-information (database) wrapper
  *
index 99b8962e2cfc0e62a3c5fb7557a2c579f3bd0923..dafacba4f428bf0b70d2dddb260caad6188f4561 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Database\Frontend\RegionMap;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
+
 /**
  * An interface for region-map (database) wrapper
  *
index 1bdea86209f2f8b9cf4a03bfc718008404245ce4..d5227be4d38ffd9ea944d5521756924ccbaef452 100644 (file)
@@ -42,7 +42,7 @@ interface CityHelper extends Helper, AddableCriteria {
        /**
         * Method to "bootstrap" the city. This step does also apply provided
         * command-line arguments stored in the request instance. You should now
-        * get it from calling $this->getRequestInstance().
+        * get it from calling FrameworkBootstrap::getRequestInstance().
         *
         * @return      void
         */
diff --git a/core b/core
index edbaec7aa8e1019d10b7a3351e1629fed93740f4..2882b57ca6f372b822f96034ff2fe6aafd7daeb8 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit edbaec7aa8e1019d10b7a3351e1629fed93740f4
+Subproject commit 2882b57ca6f372b822f96034ff2fe6aafd7daeb8