Continued:

- ops, oversaw this one
- also changed namespace for CityDaemonFactory, it is first a factory

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

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index a85a2ec71fa49282a9609d6e159e201a4bab6c58..df6f1e3bfd7cd6628f686ba5e501ed71cac60cc9 100644 (file)
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -3,7 +3,7 @@
 namespace Org\Mxchange\City\Command;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Command\BaseCommand;

diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
index b80787e4a4e5f960fb7c199dc441eef54bb35d9f..3984b23da5f6c4a336769578b4ea67acb28fd8c1 100644 (file)
--- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
+++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
@@ -1,10 +1,11 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Daemon\Factory;
+namespace Org\Mxchange\Factory\City\Daemon;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;

diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
index d2799f4c485fc2691b873d9a630f04f9717d1198..f07b6c8a0513d72ddbeb59b6645690ad0e5df2e3 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\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**

diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
index cbd6f56adc2fd161f3a72a88cff193a00852b077..f87426f8e21b73cc035e4c34f1e7f1120562e10d 100644 (file)
--- a/application/city/classes/factories/states/city/class_CityStateFactory.php
+++ b/application/city/classes/factories/states/city/class_CityStateFactory.php
@@ -3,7 +3,7 @@
 namespace Org\Mxchange\City\Factory\State;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\BaseFactory;

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 50b8aa61b51255bf24d12487db5c7240cff3eb35..1ee22ac5c2cbfb105d00ada5a0610953bedd35d3 100644 (file)
--- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
+++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;

diff --git a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
index 80eaa2af2235f0c2828d9993155fbd52f46ef0b0..6eff2c20864368830b5b630fd7b366a6c6873366 100644 (file)
--- a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
+++ b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
index f0f9c2b85678b89e1bf5ae3eeb490533c7fc7a05..78c879055dc7cf37529d2f2aeb3824c49bdad483 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter\Initialization;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
index e0ef332accb3f8ec7442198bc61a0a269915bc0d..09c438621d65c4bc6b653623b86f2ebebbe50a85 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;

diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
index ed37106ff442dc729e79b49a376414365eeaa4a5..61700e39338399c759529d3395b5c6f31cd8caca 100644 (file)
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\Filterable;

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 4f4ba2ccf1d49429e8050002f7865e36b1830620..aa7e874b1ca5ea6d271b264f5fa083c75a628c08 100644 (file)
--- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Filter\Initialization\Tasks;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;

diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php
index 4fc2b9db758a46126f010f364e651748d8887982..775b8abc65659ac2da75d50345f58be7ffa61483 100644 (file)
--- a/application/city/classes/login/class_CityGuestLogin.php
+++ b/application/city/classes/login/class_CityGuestLogin.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Login\Guest;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Auth\LoginableUser;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Factory\User\UserFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;

diff --git a/application/city/classes/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php
index 22ac35ebaf3124503969bf623be434b5baa1413c..0b8b1aebf2e559725beffc5d6e805f0d7d940ff8 100644 (file)
--- a/application/city/classes/states/city/active/class_CityActiveState.php
+++ b/application/city/classes/states/city/active/class_CityActiveState.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\State\Active;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\State\BaseCityState;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\State\Stateable;

diff --git a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
index 357f634ae16fd27aedfc670ae4ad75dc5746478a..ee4a3bf0bc05db7724a27ef39dab18bebbdd25ad 100644 (file)
--- a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
+++ b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Task\Growth\Building;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Task\BaseCityTask;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Task\Taskable;

diff --git a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
index e960b4562f6701d29e48632adeff76a171de8570..d2d514d7af6d0fbc37958cee90757eadd6d4c268 100644 (file)
--- a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
+++ b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Task\Growth\Household;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Task\BaseCityTask;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Task\Taskable;

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 81dc9725584c036f2ced88040d77162918071db8..41b51e9810b453f57b6120d0b5e284c79ee6b9e4 100644 (file)
--- a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
+++ b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
@@ -3,8 +3,8 @@
 namespace Org\Mxchange\City\Daemon\Task\Expander\Map;
 
 // Import application-specific stuff
-use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Task\BaseCityTask;
+use Org\Mxchange\Factory\City\Daemon\CityDaemonFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Task\Taskable;