Continued:

- moved ObjectFactory into deeper namespace
- ObjectFactory is now final, need to extend BaseFactory instead

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

diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php
index aad83886c51592253ae5d758022bfcde6c028102..b89c7af6a6464ad97b6a68e37794671da67b7306 100644 (file)
--- a/application/city/class_ApplicationHelper.php
+++ b/application/city/class_ApplicationHelper.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Helper\Application;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Application\BaseApplication;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Registry\Registerable;

diff --git a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
index c97464d794120cf05e37e180de31b814d97460c9..e686d1b574abc6ed8748fa657341e6b29bfc64dc 100644 (file)
--- a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
+++ b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
@@ -4,7 +4,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\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
index 914ceb0578a5f0d662d5ff7042703d3aa83d38b6..968e45e6f1f8dac6985de71936088bc5cff880a8 100644 (file)
--- a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
+++ b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
@@ -4,7 +4,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\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index e45a0f7522e3956a40804d2c3fada2faeff53279..b4e3b1cce548b08e422614a88483e9fa60034fc5 100644 (file)
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+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/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
index 5eba09704a020bf76fbecb7de09079a526535aad..167ac8f920a411d03204218b295d26b2e60385a9 100644 (file)
--- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
+++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
@@ -7,7 +7,7 @@ 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\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index b985a4aa829b6c1ecf524b9b3ef66f219fbfa161..a85a2ec71fa49282a9609d6e159e201a4bab6c58 100644 (file)
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -9,7 +9,7 @@ use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 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\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/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
index 2734597e09603fc303bd7f63eaee60bff595fc21..e95e23d842a24eabe4875325711a09e35d2ae067 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
@@ -6,7 +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\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
index 903ce08489c0549355bd0476626c0eb586f58fd2..b265c0f24a7fe43b9d526520faa68faf4d1df7d2 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
@@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\City\ManageableCity;
 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\Factory\Object\ObjectFactory;
 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_CityHtmlCityRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
index ddd6bbc02cd05519541514023289fd72c79c81ff..99c6b2f1b3e0623a0cf2effe892629f5c4a04a69 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
@@ -6,7 +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\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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_CityHtmlCityUserLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
index edb4c67bd285aa273beab567f1c6e21a9242ee3d..45341d42ae3fa58ab809d19e3c7ad5904d672560 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
@@ -6,7 +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\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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 ad4a9adbadc8aca5e273e765a87479999315e7fd..f8a5a8558d1d736b8695505c3e3544d62e9963db 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
@@ -8,7 +8,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;

diff --git a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
index 26bc2ab0230ca81b6d1852e7adcd11589ee6b256..9c9b72cf254a995dd60b442dd722e962c69f65f0 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
@@ -6,7 +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\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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 335a7af4d953ee8adc0819f0464476ba1e060338..d4f5a9f0bc8e178e09655fc252cda6d0b3c5811e 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Command;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+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/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
index 194ad83a354c13991be2b3ac7c892f2be75357d4..e6852fe8103e3ced7a4b812fdbdff1c401783b60 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 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\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;;
 use Org\Mxchange\CoreFramework\Registry\Registerable;

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
index aad1e16470b5e56edad2e23594fe4271830d110c..4ef43faf215b62a312b810708dbb64c454193ac0 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 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\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/commands/html/class_CityHtmlLogoutCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php
index 856f0d58a92b233cd43463ec1ad9810b49f5f326..5164679f3d38c9e93070b2141c70610e9123e75a 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php
@@ -6,7 +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\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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_CityHtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
index 598b7a12f0cfbacf8d011ec0ff671de717d3ba12..1b366fbd06fa69158e0b9b26557eab5de97cda4d 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 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\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/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
index 5e52149bba0bd9d30371d27decc93ddb523c650d..972b8abce82acd8e13cc7d43437d2cc961a39b20 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
@@ -8,7 +8,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+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/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
index e430d3570a7a7575e17fb79389da09112df2c165..e41a8200c30fe506a5b50edd04bf7e8089cc9461 100644 (file)
--- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
+++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;

diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
index 82440fe4f905485ab26ce32e2cea213f4b3b257e..9f87eb7310eebaf44ba10599526378b9d0ca5323 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php
+++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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/html/class_CityHtmlDefaultNewsController.php b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
index c0ef891eb08d7abab2b8d00b6db10ea1f7c5dc87..437932624e53a7f8297bf2afd76cb9ea32813150 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
+++ b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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/html/login/class_CityHtmlLoginAreaController.php b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
index af9c46915a509f6edb7d65107a06aa669086d2b5..87acb0e61788fef5ae23c45103a2d8480ec4e171 100644 (file)
--- a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
+++ b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller\LoginArea;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 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_CityInformationDatabaseFrontend.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
index 1a795ef85c31c77f42578f8bf1e80e828e7b6a43..77e4e5b181c8f11d93d9668ac52aaed066d24878 100644 (file)
--- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php
@@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\City\ManageableCity;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Request\Requestable;

diff --git a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php
index 758abf1a4c8c936246b2f547ae2c4c599111aef8..7d78471b5793fb9d52a0994117ebc5513b7a2dfd 100644 (file)
--- a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Districts;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**

diff --git a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php
index 1cf4ab59053f391f40d1c7253ce7927fba158000..90596875446b87b1693b7e850d07e5a18f8ed340 100644 (file)
--- a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Lots;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**

diff --git a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
index dc4004f139debce7163e04f76bccef972b7fb556..4044201b3153414b9e5ae435d1cb0fa606734cbd 100644 (file)
--- a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Database\Frontend\Sections;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**

diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
index a670a212d4bb9c2c63e447a5ff965ced7727b327..f5a4986bb2c2ec23945ddba8661521079e1642f5 100644 (file)
--- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
@@ -7,7 +7,7 @@ use Org\Mxchange\City\Factory\Manager\ManagerFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 

diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
index 6ddbdbafcdab32327b478d4a049e4bf9571899aa..1b50f562647fcca4fb56d8cde6ff666e213fba25 100644 (file)
--- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
+++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Region;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 

diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
index 3bb123d045d042a758fa5615c26fee9cff3d65d8..b80787e4a4e5f960fb7c199dc441eef54bb35d9f 100644 (file)
--- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
+++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Daemon\Factory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
@@ -32,7 +32,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 CityDaemonFactory extends ObjectFactory {
+class CityDaemonFactory extends BaseFactory {
        /**
         * Protected constructor
         *

diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
index 6dac023f33c77a7246f18160e071dfceb103bf55..d2799f4c485fc2691b873d9a630f04f9717d1198 100644 (file)
--- a/application/city/classes/factories/manager/class_ManagerFactory.php
+++ b/application/city/classes/factories/manager/class_ManagerFactory.php
@@ -3,7 +3,7 @@
 namespace Org\Mxchange\City\Factory\Manager;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
@@ -28,7 +28,7 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
  * 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 ManagerFactory extends ObjectFactory {
+class ManagerFactory extends BaseFactory {
        /**
         * Protected constructor
         *

diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
index bcab149b30224226833a725ec8b88a9b07da71e0..cbd6f56adc2fd161f3a72a88cff193a00852b077 100644 (file)
--- a/application/city/classes/factories/states/city/class_CityStateFactory.php
+++ b/application/city/classes/factories/states/city/class_CityStateFactory.php
@@ -6,7 +6,11 @@ namespace Org\Mxchange\City\Factory\State;
 use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+
+// Import SPL stuff
+use \InvalidArgumentException;
 
 /**
  * A factory class for city states
@@ -30,7 +34,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
  * 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 CityStateFactory extends ObjectFactory {
+class CityStateFactory extends BaseFactory {
        /**
         * Protected constructor
         *
@@ -48,18 +52,21 @@ class CityStateFactory extends ObjectFactory {
         * @param       $stateName              Name of the state
         * @return      $stateInstance  A Stateable class instance
         */
-       public static final function createCityStateInstanceByName ($stateName) {
-               // Then construct the class' configuraton entry
-               $className = 'city_' . $stateName . '_state_class';
+       public static final function createCityStateInstanceByName (string $stateName) {
+               // Validate parameter
+               if (empty($stateName)) {
+                       // Throw IAE
+                       throw new InvalidArgumentException('Parameter "stateName" is empty');
+               }
 
                // Get a class from that configuration entry
-               $stateInstance = self::createObjectByConfiguredName($className);
+               $stateInstance = ObjectFactory::createObjectByConfiguredName(sprintf('city_%s_state_class', $stateName));
 
                // Get city instance
                $cityInstance = CityDaemonFactory::createCityDaemonInstance();
 
                // Debug message
-               self::createDebugInstance(__CLASS__)->debugOutput('CITY-STATE-FACTORY[' . __METHOD__ . ':' . __LINE__ . ']: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
+               self::createDebugInstance(__CLASS__)->debugOutput('CITY-STATE-FACTORY: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
 
                // Once we have that state, set it in the city instance
                $cityInstance->setStateInstance($stateInstance);

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 642e8ac4370821c26f7b38ae459b472e94a16e76..4f4ba2ccf1d49429e8050002f7865e36b1830620 100644 (file)
--- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -7,7 +7,7 @@ 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\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;

diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php
index 8297bb9709dcef19aa8a9b244816f804a59f4494..873946e6d4417bace817c11ec08005dcfb05fbbd 100644 (file)
--- a/application/city/classes/login/class_CityUserLogin.php
+++ b/application/city/classes/login/class_CityUserLogin.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Login\User;
 // 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/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php
index 49876c1d86d269ee8025b38db5e07f70d8cd4cef..65f92baab62ad53c3fd03f3c00df18176c51a48f 100644 (file)
--- a/application/city/classes/login/helper/class_CityLoginHelper.php
+++ b/application/city/classes/login/helper/class_CityLoginHelper.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Helper\Login;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\User\ManageableAccount;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Helper\Login\BaseLoginHelper;
 use Org\Mxchange\CoreFramework\Helper\Login\HelpableLogin;

diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php
index 5e2680d55b6dd2a25bcc268e7b9f5f27d5c6ce48..18f47ba793a525b51adf749ab1a0cb793a915b90 100644 (file)
--- a/application/city/classes/registration/class_CityRegistration.php
+++ b/application/city/classes/registration/class_CityRegistration.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registration\BaseRegistration;
 use Org\Mxchange\CoreFramework\Registration\User\UserRegister;
 use Org\Mxchange\CoreFramework\Request\Requestable;

diff --git a/application/city/templates/code/action_city_login_city_map.ctp b/application/city/templates/code/action_city_login_city_map.ctp
index 492fd312a52842b90085bd4012774d1415b2f0d6..e13bf34493a2a0378e874aef14eca3b91500885e 100644 (file)
--- a/application/city/templates/code/action_city_login_city_map.ctp
+++ b/application/city/templates/code/action_city_login_city_map.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get form helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'city_map'));

diff --git a/application/city/templates/code/action_city_login_government_startup_help.ctp b/application/city/templates/code/action_city_login_government_startup_help.ctp
index c5b0513b9b24f1b75f0d95a49a83ba7b67e2c153..cab2f89c98b13762bf1d48f7766d3a5e2ce8c4e3 100644 (file)
--- a/application/city/templates/code/action_city_login_government_startup_help.ctp
+++ b/application/city/templates/code/action_city_login_government_startup_help.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get form helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'city_government_startup'));

diff --git a/application/city/templates/code/action_city_login_government_training.ctp b/application/city/templates/code/action_city_login_government_training.ctp
index 3fb80901cafaeea6fea32af0fcebf5c26c1f0040..ec859132048209e3ea3608a7e1fac62989db7d6b 100644 (file)
--- a/application/city/templates/code/action_city_login_government_training.ctp
+++ b/application/city/templates/code/action_city_login_government_training.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get form helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'city_government_training'));

diff --git a/application/city/templates/code/action_city_login_logout.ctp b/application/city/templates/code/action_city_login_logout.ctp
index 970f4391826d97c1877c12cb26b1cc2a7811e0ed..7d355eb37520b21a7882e61bb8cb431890586c79 100644 (file)
--- a/application/city/templates/code/action_city_login_logout.ctp
+++ b/application/city/templates/code/action_city_login_logout.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'logout_now'));

diff --git a/application/city/templates/code/action_city_login_profile.ctp b/application/city/templates/code/action_city_login_profile.ctp
index 7e7f0750251039b187367154286753917f24ecbd..b7768faa61464bea521eff18f5cea93059fd49e1 100644 (file)
--- a/application/city/templates/code/action_city_login_profile.ctp
+++ b/application/city/templates/code/action_city_login_profile.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class

diff --git a/application/city/templates/code/action_city_login_status_problem.ctp b/application/city/templates/code/action_city_login_status_problem.ctp
index 8a289924222a466ba3508f1f503498862afcbec6..7d317b8d4a5ccd8b103e78aba039a47d32f765cd 100644 (file)
--- a/application/city/templates/code/action_city_login_status_problem.ctp
+++ b/application/city/templates/code/action_city_login_status_problem.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class

diff --git a/application/city/templates/code/block_persona_data.ctp b/application/city/templates/code/block_persona_data.ctp
index 7a19a6ca51911371b8f9580b5774de6305cea447..90e52c9a8c2826995940ae7d2fe230f0a31516db 100644 (file)
--- a/application/city/templates/code/block_persona_data.ctp
+++ b/application/city/templates/code/block_persona_data.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get a helper instance for the profile link (and maybe later more!)
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'profile'));

diff --git a/application/city/templates/code/captch_graphic_code.ctp b/application/city/templates/code/captch_graphic_code.ctp
index 060cef114b61ec4c8a60c1dbe7c2d75a5b69eedf..a46090a94a475d39f44d1f7e9cd4f76a473064c4 100644 (file)
--- a/application/city/templates/code/captch_graphic_code.ctp
+++ b/application/city/templates/code/captch_graphic_code.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get a helper instance without a form tag
 $captchaHelper = ObjectFactory::createObjectByConfiguredName('html_form_helper_class', array($this, 'captcha_code', false, false));

diff --git a/application/city/templates/code/confirm_link.ctp b/application/city/templates/code/confirm_link.ctp
index 16306f97770319dfdbf740f3d230595d0f5d6911..5a998fb4932e986f2f23b0b00143c51645751b9c 100644 (file)
--- a/application/city/templates/code/confirm_link.ctp
+++ b/application/city/templates/code/confirm_link.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'direct_login'));

diff --git a/application/city/templates/code/login_failed.ctp b/application/city/templates/code/login_failed.ctp
index c876d2ed3bbea3644337d97b099df2ed6d18db39..f295de422f387674df0e18cb7ec6cd6f733aa4d2 100644 (file)
--- a/application/city/templates/code/login_failed.ctp
+++ b/application/city/templates/code/login_failed.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'login_retry'));

diff --git a/application/city/templates/code/login_form.ctp b/application/city/templates/code/login_form.ctp
index 0bff557832b9ebde5789e80f9d577740335a78a1..8824a9a192c5a609c0a1a5c263c7a817155ba201 100644 (file)
--- a/application/city/templates/code/login_form.ctp
+++ b/application/city/templates/code/login_form.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class

diff --git a/application/city/templates/code/login_main.ctp b/application/city/templates/code/login_main.ctp
index c3ed7bcf40bdd383c632ac0bf71ade7466865e51..35d22301e863bd9278401d3628da7fac57bfd18a 100644 (file)
--- a/application/city/templates/code/login_main.ctp
+++ b/application/city/templates/code/login_main.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 ///////////////////////////////
 // Assign personal user data //

diff --git a/application/city/templates/code/logout_done.ctp b/application/city/templates/code/logout_done.ctp
index 70b50f5ab815a38e636246bd39d73d598fd32bde..1b8e7a283b4a928a5d7b5361e45200de2a5c4832 100644 (file)
--- a/application/city/templates/code/logout_done.ctp
+++ b/application/city/templates/code/logout_done.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance
 $helperInstance = ObjectFactory::createObjectByConfiguredName('html_link_helper_class', array($this, 'relogin'));

diff --git a/application/city/templates/code/register_form.ctp b/application/city/templates/code/register_form.ctp
index c8041e140bae38762f7957084ab76a17406cb215..cc425528eb8cfba756c997e5f6393b4276d1ef9e 100644 (file)
--- a/application/city/templates/code/register_form.ctp
+++ b/application/city/templates/code/register_form.ctp
@@ -1,6 +1,6 @@
 <?php
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 
 // Get helper instance for web forms. This will add the opening form-tag to
 // the helper's render cache which is simply a small variable in the class

diff --git a/core b/core
index 6e91754d589773df8bd3746008dd782133a48674..5e0cb5baf0c78f49644b96da6bd7a2821590526d 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 6e91754d589773df8bd3746008dd782133a48674
+Subproject commit 5e0cb5baf0c78f49644b96da6bd7a2821590526d

diff --git a/index.php b/index.php
index bc2faf43ddb258a277fbd85e2ab58b31c7660a05..a881011a008250dd45f292ff3c7cc289d70b9d83 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\EntryPoint;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException;
 use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Localization\LanguageSystem;