From 51ef31db0093cb407b74ff6b48a3c56b04a4e9dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 7 Dec 2020 09:32:38 +0100
Subject: [PATCH] Continued: - ops, oversaw this one - also changed namespace
 for CityDaemonFactory, it is first a factory
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../commands/console/class_CityConsoleDaemonCommand.php        | 2 +-
 .../classes/factories/city_daemon/class_CityDaemonFactory.php  | 3 ++-
 .../city/classes/factories/manager/class_ManagerFactory.php    | 1 +
 .../classes/factories/states/city/class_CityStateFactory.php   | 2 +-
 .../class_CityDaemonBootstrapExtraBootstrappingFilter.php      | 2 +-
 .../init/class_CityDaemonBootstrapInitDaemonFilter.php         | 2 +-
 .../city_daemon/class_CityDaemonInitializationFilter.php       | 2 +-
 .../filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php | 2 +-
 .../shutdown/city/class_CityDaemonShutdownCityFilter.php       | 2 +-
 .../class_CityDaemonTaskHandlerInitializerFilter.php           | 2 +-
 application/city/classes/login/class_CityGuestLogin.php        | 2 +-
 .../city/classes/states/city/active/class_CityActiveState.php  | 2 +-
 .../daemon/building/class_CityDaemonBuildingGrowthTask.php     | 2 +-
 .../daemon/household/class_CityDaemonHouseholdGrowthTask.php   | 2 +-
 .../daemon/map_expander/class_CityDaemonMapExpanderTask.php    | 2 +-
 15 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index a85a2ec..df6f1e3 100644
--- 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 b80787e..3984b23 100644
--- 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 d2799f4..f07b6c8 100644
--- 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 cbd6f56..f87426f 100644
--- 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 50b8aa6..1ee22ac 100644
--- 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 80eaa2a..6eff2c2 100644
--- 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 f0f9c2b..78c8790 100644
--- 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 e0ef332..09c4386 100644
--- 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 ed37106..61700e3 100644
--- 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 4f4ba2c..aa7e874 100644
--- 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 4fc2b9d..775b8ab 100644
--- 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 22ac35e..0b8b1ae 100644
--- 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 357f634..ee4a3bf 100644
--- 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 e960b45..d2d514d 100644
--- 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 81dc972..41b51e9 100644
--- 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;
-- 
2.39.5