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 6ce4332d5034f7692fe21682342b9e8ec45f31c6..23e6cab95f0fa40786ad829c1d338b7698913a3c 100644 (file)
--- a/framework/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/framework/main/classes/factories/stacks/class_FileStackFactory.php
@@ -1,11 +1,14 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\Factory\Stack;
+namespace Org\Mxchange\CoreFramework\Factory\Stack;

 
 // Import framework stuff
 
 // Import framework stuff

-use CoreFramework\Bootstrap\FrameworkBootstrap;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+
+// Import SPL stuff
+use \SplFileInfo;

 
 /**
  * A factory class for file-based stacks
 
 /**
  * A factory class for file-based stacks


@@ -49,23 +52,23 @@ class FileStackFactory extends ObjectFactory {
         */
        public static final function createFileStackInstance ($prefix, $stackName) {
                // Construct file stack name
         */
        public static final function createFileStackInstance ($prefix, $stackName) {
                // Construct file stack name

-               $stackFileName = sprintf('%s%s/%s.%s',
-                       FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('framework_base_path'),
+               $fileInfoInstance = new SplFileInfo(sprintf('%s%s/%s.%s',
+                       FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('root_base_path'),

                        FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_file_stacks_path'),
                        $stackName,
                        FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('file_stacks_extension')
                        FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_file_stacks_path'),
                        $stackName,
                        FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('file_stacks_extension')

-               );
+               ));

 
                // If there is no handler?
 
                // If there is no handler?

-               if (Registry::getRegistry()->instanceExists($stackName . '_stack')) {
+               if (GenericRegistry::getRegistry()->instanceExists($stackName . '_stack')) {

                        // Get handler from registry
                        // Get handler from registry

-                       $stackInstance = Registry::getRegistry()->getInstance($stackName . '_stack');
+                       $stackInstance = GenericRegistry::getRegistry()->getInstance($stackName . '_stack');

                } else {
                        // Get the handler instance
                } else {
                        // Get the handler instance

-                       $stackInstance = self::createObjectByConfiguredName($prefix . '_' . $stackName . '_stack_class', array($stackFileName, $prefix . '_' . $stackName));
+                       $stackInstance = self::createObjectByConfiguredName($prefix . '_' . $stackName . '_stack_class', array($fileInfoInstance, $prefix . '_' . $stackName));

 
                        // Add it to the registry
 
                        // Add it to the registry

-                       Registry::getRegistry()->addInstance($stackName . '_stack', $stackInstance);
+                       GenericRegistry::getRegistry()->addInstance($stackName . '_stack', $stackInstance);

                }
 
                // Return the instance
                }
 
                // Return the instance