Continued:

[core.git] / framework / main / classes / factories / index / class_FileStackIndexFactory.php

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 9e11ddccbce7e5c0834f48e7d3ec8c57355abba5..e37beb907fb3cb514f8053fd023fec089aabcf30 100644 (file)
--- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -5,7 +5,8 @@ namespace Org\Mxchange\CoreFramework\Factory\Stack\File;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\BaseFactory;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 
 // Import SPL stuff
 use \InvalidArgumentException;
@@ -16,7 +17,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 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.ship-simu.org
  *
@@ -39,7 +40,7 @@ class FileStackIndexFactory extends BaseFactory {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -55,16 +56,16 @@ class FileStackIndexFactory extends BaseFactory {
                // If there is no handler?
                if (empty($type)) {
                        // Throw IAE
-                       throw new InvalidArgumentException('Parameter "type" is empty');
-               } elseif (GenericRegistry::getRegistry()->instanceExists($type . '_index')) {
+                       throw new InvalidArgumentException('Parameter "type" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+               } elseif (ObjectRegistry::getRegistry('generic')->instanceExists($type . '_index')) {
                        // Get handler from registry
-                       $indexInstance = GenericRegistry::getRegistry()->getInstance($type . '_index');
+                       $indexInstance = ObjectRegistry::getRegistry('generic')->getInstance($type . '_index');
                } else {
                        // Get the handler instance
                        $indexInstance = ObjectFactory::createObjectByConfiguredName($type . '_file_stack_index_class', [$fileInfoInstance]);
 
                        // Add it to the registry
-                       GenericRegistry::getRegistry()->addInstance($type . '_index', $indexInstance);
+                       ObjectRegistry::getRegistry('generic')->addInstance($type . '_index', $indexInstance);
                }
 
                // Return the instance