Continued:

[core.git] / framework / main / classes / factories / stacks / class_FileStackFactory.php

diff --git a/framework/main/classes/factories/stacks/class_FileStackFactory.php b/framework/main/classes/factories/stacks/class_FileStackFactory.php
index 8b30ffea5aafe7b410aca836dbd01fa97683d663..23e6cab95f0fa40786ad829c1d338b7698913a3c 100644 (file)
--- a/framework/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/framework/main/classes/factories/stacks/class_FileStackFactory.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Factory\Stack;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 // Import SPL stuff
 use \SplFileInfo;
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/stacks/class_FileStackFactory.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/factories/stacks/class_FileStackFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -64,15 +60,15 @@ class FileStackFactory extends ObjectFactory {
                ));
 
                // If there is no handler?
-               if (Registry::getRegistry()->instanceExists($stackName . '_stack')) {
+               if (GenericRegistry::getRegistry()->instanceExists($stackName . '_stack')) {
                        // Get handler from registry
-                       $stackInstance = Registry::getRegistry()->getInstance($stackName . '_stack');
+                       $stackInstance = GenericRegistry::getRegistry()->getInstance($stackName . '_stack');
                } else {
                        // Get the handler instance
                        $stackInstance = self::createObjectByConfiguredName($prefix . '_' . $stackName . '_stack_class', array($fileInfoInstance, $prefix . '_' . $stackName));
 
                        // Add it to the registry
-                       Registry::getRegistry()->addInstance($stackName . '_stack', $stackInstance);
+                       GenericRegistry::getRegistry()->addInstance($stackName . '_stack', $stackInstance);
                }
 
                // Return the instance