X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Flogin%2Fclass_LoginFactory.php;h=1275f770d50d1ee4f89439925bec38d941ef0277;hp=bc8e86d97e8cfa8f28b0340023695c3609a84027;hb=HEAD;hpb=a60894f1d6ef33613d2d0351075aa07aa257f304

diff --git a/framework/main/classes/factories/login/class_LoginFactory.php b/framework/main/classes/factories/login/class_LoginFactory.php
index bc8e86d9..f7a2bd37 100644
--- a/framework/main/classes/factories/login/class_LoginFactory.php
+++ b/framework/main/classes/factories/login/class_LoginFactory.php
@@ -3,8 +3,9 @@
 namespace Org\Mxchange\CoreFramework\Factory\Login;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Factory\BaseFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -12,7 +13,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -29,13 +30,13 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  * 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 LoginFactory extends ObjectFactory {
+class LoginFactory extends BaseFactory {
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -48,7 +49,7 @@ class LoginFactory extends ObjectFactory {
 	 */
 	public static final function createLoginObjectByRequest (Requestable $requestInstance) {
 		// Get registry instance
-		$registryInstance = GenericRegistry::getRegistry();
+		$registryInstance = ObjectRegistry::getRegistry('factory');
 
 		// Do we have an instance in the registry?
 		if ($registryInstance->instanceExists('login_helper')) {
@@ -58,13 +59,13 @@ class LoginFactory extends ObjectFactory {
 			// Probe on member instance
 			try {
 				// Try to instance member login class
-				$loginInstance = self::createObjectByConfiguredName('user_login_class');
+				$loginInstance = ObjectFactory::createObjectByConfiguredName('user_login_class');
 
 				// Test login
 				$loginInstance->testLogin($requestInstance);
 			} catch (UnexpectedGuestAccountException $e) {
 				// Then try guest login
-				$loginInstance = self::createObjectByConfiguredName('guest_login_class');
+				$loginInstance = ObjectFactory::createObjectByConfiguredName('guest_login_class');
 
 				// Test login again
 				$loginInstance->testLogin($requestInstance);