Next wave:

- "imported" classes/interfaces
- created new namespaces
- updated configuration entries

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/city/classes/city_daemon/class_ b/application/city/classes/city_daemon/class_
index 3733a98443623e470ca6da9bb818b15ef4de6cd8..8e70ece8bb36f4542db978ebae77d71e95c4ae91 100644 (file)
--- a/application/city/classes/city_daemon/class_
+++ b/application/city/classes/city_daemon/class_
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Simulation;
 
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 2d17669b216c9b9803eaf7d5e5112f3a98711d5d..9d7302a9b76d7ef44f6a316e6463bb8802bae5de 100644 (file)
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -2,8 +2,15 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon;
 
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 // Import framework stuff
+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\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
index 6e278eccf84eadc89c6f2a23861c549b0d7cbb2d..282015826695ab5d9cbd963a4b530cc11d528e65 100644 (file)
--- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
+++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
@@ -4,9 +4,12 @@ namespace Org\Mxchange\City\Daemon\Simulation;
 
 // Import own 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\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**

diff --git a/application/city/classes/class_ b/application/city/classes/class_
index 81c984741c11aab3d191ac8d4132bf84d4ed4e69..408811fcbbd2dcef25e59e49dcfc62ac69f6169a 100644 (file)
--- a/application/city/classes/class_
+++ b/application/city/classes/class_
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A ??? city class
  *

diff --git a/application/city/classes/class_Base b/application/city/classes/class_Base
index 75f09344721418f14d9bba96b28d984aa2ce577e..2b83c9828f353512472876182cde025924cce07a 100644 (file)
--- a/application/city/classes/class_Base
+++ b/application/city/classes/class_Base
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A general ??? class
  *

diff --git a/application/city/classes/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php
index f4448a07cfee62e50d32ffd8ef2045ee5b38039f..f44083aa3aafe53aca1b293721c850a03e9930de 100644 (file)
--- a/application/city/classes/class_BaseCitySystem.php
+++ b/application/city/classes/class_BaseCitySystem.php
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Generic;
+
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general city (simulation) system class
  *

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index 684cc1a5877d682bf289dcc90b7948ab8b330765..32625752e276a09f25eb0f30ba33ec430e434dd3 100644 (file)
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -2,11 +2,15 @@
 // Own namespace
 namespace Org\Mxchange\City\Command;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
index e3f1505f8e20a610f4c2cad0949653bf55008a95..1dc4b437a575f41a740b8264931cfe5506b06a03 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
@@ -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\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
index 073f0e3c85413b621b8a933793cd49bd766e25b8..024f86ddd81b9fe10d8ff9213c7ca64e330efa44 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
index 3ffce95e57a0b145844a3e7da0f4971ce8fc3c2f..75d6adf03a944f1cd104b883d0dabf9fc001c61b 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
@@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
index d5e711327048dce88cf6abae01a9f0b67c1ae00b..761b658e0a806186c059f76be4ac124260997008 100644 (file)
--- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
+++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
@@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller;
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
index d9acf4b93070f6922a6f614a4439fe4c894f2f7a..8db2bbb65cc6aa831487ea652a2fbd8670f6e9ef 100644 (file)
--- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
@@ -4,9 +4,11 @@ namespace Org\Mxchange\City\Database\Frontend\Information;
 
 // Import own 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\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**

diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
index 6fbd824f445db9454a3a81c52e672dd1abfabaa4..e51bf14801f7360dc8330ef11e28d24ccf321ea1 100644 (file)
--- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\RegionInformation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A database wrapper for region informations

diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
index c2e4b30dd0391291aab80283752b5db9b96fb776..b8fa671f15ce2d5c17e91cb66eab8de900b5589b 100644 (file)
--- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Region;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A database wrapper for region maps

diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
index 137e2423cdf09985324b13f7f720c52b6a68915f..6165d107862df7516af4190f5463e040e59d4cc0 100644 (file)
--- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
+++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Daemon\Factory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -70,7 +71,7 @@ class CityDaemonFactory extends ObjectFactory {
                        }
 
                        // Now convert the city-mode in a class name
-                       $className = 'Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
+                       $className = 'Org\Mxchange\City\Daemon\Simulation\Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
 
                        // Get the city instance
                        $cityInstance = ObjectFactory::createObjectByName($className, array($requestInstance));

diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
index 03d6f05f32735cc40c04afb512d4f2c6e74d295b..7c2b5bebf0bae8f0b691a817b31f6e4dd2d138bc 100644 (file)
--- a/application/city/classes/factories/manager/class_ManagerFactory.php
+++ b/application/city/classes/factories/manager/class_ManagerFactory.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Factory\Manager;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A factory class for managers

diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
index cf5cfcdd5470a5a1f38d9d65c261cb850160b791..fd760976decc811128c1caa28d24e149231c2c48 100644 (file)
--- a/application/city/classes/factories/states/city/class_CityStateFactory.php
+++ b/application/city/classes/factories/states/city/class_CityStateFactory.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Mxchange\City\Factory\State;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 

diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
index e9ff89ba46a48a4096c831f2026277c1872213ba..cc8827b5f7bdca861d4b9bb7b3eda47f6eb2d0a8 100644 (file)
--- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
+++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
index d1840eb159087d616793f6e5f3c83c6427489ffe..a9c90133faaf4c753641984fa6b71593d49e5a96 100644 (file)
--- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
+++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
index 38b096f266d9130ef292511fe1e4bd1a2f97e3b6..c31cbc4d4b9b91536a5abc5c0b7e5f9e208a4bc1 100644 (file)
--- a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
+++ b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
index 34aca07dab1f9db123d651a2b1c86a669673aa39..55024093769c13dc1e4fc7c2521e2b5b06186cd7 100644 (file)
--- a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
+++ b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemon b/application/city/classes/filter/city_daemon/class_CityDaemon
index a91b26517b70ecf1da50ba8ed9a7175f4141f642..e6d9538794b95468c82210064696d0ff98c04bf1 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemon
+++ b/application/city/classes/filter/city_daemon/class_CityDaemon
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
index e94f998b3064943618dc8f39d128aeeff533043c..58d8960e6567e8459f254ae94c69e1581db88676 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Initialization;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
index 31e68a3db51f88cea3b0288ea8afe66199e820b8..d93c5cfb8d9f7dc91e2116141461a8a982a6e6fd 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
index 45148ffea94bef760e94f56641beb3d899aad948..ba17da8c53859fabf906aefe9a24b79bd5959831 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/class_ b/application/city/classes/filter/class_
index 14ac2dd2ffa62f35e7b9f4749442579a3a161d2e..1f26eb1d7778c2adb9b07339a0bc8f0c68cd694f 100644 (file)
--- a/application/city/classes/filter/class_
+++ b/application/city/classes/filter/class_
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\!!!\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php
index 8f369565a333ce1765cf2df7ffd57879eb948e88..0e22c1597cb40550e081f7d16e805371e5afe39b 100644 (file)
--- a/application/city/classes/filter/class_BaseCityFilter.php
+++ b/application/city/classes/filter/class_BaseCityFilter.php
@@ -1,4 +1,12 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Filter;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+
 /**
  * A generic filter for hub project
  *

diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
index 2d151fa9ca5317b704eaecfad283da3f835f5503..5a7cdc0d5545a49eecfcc8f546c36b557fd5649f 100644 (file)
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
index 12c3d470f500ef7b408b6465104553f43a017221..72e5d1e72f82c445f997c50a9f95a9a933699b76 100644 (file)
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
index 8eb3714ee2b23160b866a1a686667ec8f56674e2..d61e4a0dec8ae001f84430d31cb3069d5a3abe03 100644 (file)
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
index 949dfe28f250d313988369afacbe52958ab92bd4..1ad38dfd772a83dd63c49d2c40835828731d9656 100644 (file)
--- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -1,9 +1,14 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Daemon\Filter\Tasks;
+namespace Org\Mxchange\City\Daemon\Filter\Initialization\Tasks;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
index 4770b8bf27bf020307bf8234edc0753e9fe53ead..c2ab884aaf9c9f76e4f58b182fc917d5546b8c8a 100644 (file)
--- a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
+++ b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
@@ -3,6 +3,8 @@
 namespace Org\Mxchange\City\Filter\Verifier;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php
index 14aab5807de2da780be24e083d0232e359b6da4c..3ec12fcc6cce77e785f9d76b02ce3094415d45f5 100644 (file)
--- a/application/city/classes/login/class_CityGuestLogin.php
+++ b/application/city/classes/login/class_CityGuestLogin.php
@@ -4,6 +4,7 @@ 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\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php
index 8d5d84aa4b96076d84081da47a15a10ca8000fb1..7ab7f2d96e5db737f2b2e463d0f08d41a96e3ef2 100644 (file)
--- a/application/city/classes/login/class_CityUserLogin.php
+++ b/application/city/classes/login/class_CityUserLogin.php
@@ -4,6 +4,8 @@ namespace Org\Mxchange\City\Login\User;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php
index d9652bcf03197bc241816025a6ba94b6e4276b2c..0a8b33c005087e14d9e89bd5af6f398807e3c3f5 100644 (file)
--- a/application/city/classes/login/helper/class_CityLoginHelper.php
+++ b/application/city/classes/login/helper/class_CityLoginHelper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Helper\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -116,6 +117,3 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
                Registry::getRegistry()->addInstance('login', $loginInstance);
        }
 }
-
-//
-?>

diff --git a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
index b2bc7753fbea99bf2fcacfb139a166120aa5051b..63147d6197e6697ffc834354d88f8090dc574f5b 100644 (file)
--- a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
+++ b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\District;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city districts manager
  *

diff --git a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
index d1585587e363dc9d9fd84a80d31d5e5c37ab1451..3650cc252c09aba65d8050ef3ff88d7872ff155d 100644 (file)
--- a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
+++ b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Lots;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city lots manager
  *

diff --git a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
index 6e540962b92d24bb35a71f29e34bd47a91309af7..903d8377b25f620c852595a209554d4520bfae83 100644 (file)
--- a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
+++ b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Sections;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city sections manager
  *

diff --git a/application/city/classes/manager/class_ b/application/city/classes/manager/class_
index b8c291d83f0a9c95b93e62d93b1794abb8299790..880f5862a11b890777d4a6267a629cfafff32b49 100644 (file)
--- a/application/city/classes/manager/class_
+++ b/application/city/classes/manager/class_
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A ??? manager
  *

diff --git a/application/city/classes/manager/class_BaseManager.php b/application/city/classes/manager/class_BaseManager.php
index 1f281bccb868999ee241aace18b619b31425fc49..7ceaa1326af895075d81cbbc42fddb7ec3960bd8 100644 (file)
--- a/application/city/classes/manager/class_BaseManager.php
+++ b/application/city/classes/manager/class_BaseManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A general Manager class
  *

diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php
index 4bda7caf7476cdb85fdc585030ccb14c3f0b59f9..f20f9ebed3df77514f4b62f7d3ddff272861df83 100644 (file)
--- a/application/city/classes/registration/class_CityRegistration.php
+++ b/application/city/classes/registration/class_CityRegistration.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Registration;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
@@ -210,6 +211,3 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time()));
        }
 }
-
-//
-?>

diff --git a/application/city/classes/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php
index bb3473a9b631f7eef93acae9aff12e25d5cbd4d2..56a78214462c314904c3d38fdc189ae531003f1c 100644 (file)
--- a/application/city/classes/states/city/active/class_CityActiveState.php
+++ b/application/city/classes/states/city/active/class_CityActiveState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\State\Active;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A active city state class
  *

diff --git a/application/city/classes/tasks/class_BaseCityTask.php b/application/city/classes/tasks/class_BaseCityTask.php
index 92550f6aa364b51e26610d71bef42edbf299ca49..edca046947dea3c845756ecdd8c6d27e3347d204 100644 (file)
--- a/application/city/classes/tasks/class_BaseCityTask.php
+++ b/application/city/classes/tasks/class_BaseCityTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Task;
+
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
 /**
  * A general CityTask class
  *

diff --git a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
index b536f751b419c0d994900a39a5bcee6d531db387..084dbc5fb32ed526e21ad4861cc187114d06509f 100644 (file)
--- a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
+++ b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Growth\Building;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A BuildingGrowth city daemon-task
  *

diff --git a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
index 5b749ca21d330bc98729cad1d2a459c8d2d4b53e..2b25dd203550dc3823df41f4d9937782abdf7c99 100644 (file)
--- a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
+++ b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Growth\Household;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A HouseholdGrowth city daemon-task
  *

diff --git a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
index fa7db40e3f2a70456446c35518877cc4c2044c20..d5b29a379afcc961553c787585e4cfe835f66568 100644 (file)
--- a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
+++ b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Expander\Map;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A map expander task for the daemon
  *

diff --git a/application/city/config.php b/application/city/config.php
index a31b52f4f6a40e9bb07984246142b33251e05180..ff7bb46bd92cdc4758363fb7439c3142a3460a06 100644 (file)
--- a/application/city/config.php
+++ b/application/city/config.php
@@ -35,13 +35,13 @@ $cfg = FrameworkBootstrap::getConfigurationInstance();
 $cfg->setConfigEntry('city_default_mode', 'default');
 
 // CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter');
+$cfg->setConfigEntry('news_download_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter');
 
 // CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', 'NewsProcessFilter');
+$cfg->setConfigEntry('news_process_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter');
 
 // CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', 'ConsoleNewsReader');
+$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');
@@ -520,31 +520,31 @@ $cfg->setConfigEntry('default_city_console_controller', 'daemon');
 $cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityConsoleCommandResolver');
 
 // CFG: CITY-DAEMON-PHP-REQUIREMENTS-FILTER
-$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'CityDaemonPhpRequirementsFilter');
+$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonPhpRequirementsFilter');
 
 // CFG: CITY-DAEMON-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_initializer_filter', 'CityDaemonInitializationFilter');
+$cfg->setConfigEntry('city_daemon_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\CityDaemonInitializationFilter');
 
 // CFG: CITY-DAEMON-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'CityDaemonTaskHandlerInitializerFilter');
+$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\Tasks\CityDaemonTaskHandlerInitializerFilter');
 
 // CFG: CITY-DAEMON-WELCOME-TEASER-FILTER
-$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'CityDaemonWelcomeTeaserFilter');
+$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonWelcomeTeaserFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-INIT-DAEMON-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'CityDaemonBootstrapInitDaemonFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapInitDaemonFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'CityDaemonBootstrapExtraBootstrappingFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapExtraBootstrappingFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-TASK-HANDLER-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'CityDaemonShutdownTaskHandlerFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownTaskHandlerFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-CITY-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'CityDaemonShutdownCityFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownCityFilter');
 
 // CFG: NEWS-READER-DAEMON-CLASS
-$cfg->setConfigEntry('news_reader_daemon_class', 'ConsoleNewsReader');
+$cfg->setConfigEntry('news_reader_daemon_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');
 
 // CFG: NEWS-DAEMON-LIMIT
 $cfg->setConfigEntry('news_daemon_limit', 5);

diff --git a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
index 370dc043444339127bc15d875656640763bf3d0f..74d85cceb0501801b3e152f6cc11b0ae543f9486 100644 (file)
--- a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
+++ b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Information;
 
 // Import own stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
+use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Request\Requestable;

diff --git a/application/city/interfaces/helper/city/class_CityHelper.php b/application/city/interfaces/helper/city/class_CityHelper.php
index 4c57cf66eb26729e615c5965700a5eaa7f8130a3..1bdea86209f2f8b9cf4a03bfc718008404245ce4 100644 (file)
--- a/application/city/interfaces/helper/city/class_CityHelper.php
+++ b/application/city/interfaces/helper/city/class_CityHelper.php
@@ -3,6 +3,9 @@
 namespace Org\Mxchange\City\Helper;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
+use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
+use Org\Mxchange\CoreFramework\Helper\Helper;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 

diff --git a/core b/core
index 1abe7710d866014d74aebda110633e29bf907dee..edbaec7aa8e1019d10b7a3351e1629fed93740f4 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1abe7710d866014d74aebda110633e29bf907dee
+Subproject commit edbaec7aa8e1019d10b7a3351e1629fed93740f4