X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fstacker%2Ffile%2Fclass_BaseFileStack.php;h=8bf35ac9aab88d04dcf03d01b8cddd5c1fb65701;hp=6734e0e7937822db3de5976839aeabf25416f6c1;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=b9bfbe86c031c9d83c3670602906df191a33ba2a

diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php
index 6734e0e7..8bf35ac9 100644
--- a/framework/main/classes/stacker/file/class_BaseFileStack.php
+++ b/framework/main/classes/stacker/file/class_BaseFileStack.php
@@ -1,20 +1,28 @@
 <?php
 // Own namespace
-namespace CoreFramework\Stacker\Filesystem;
+namespace Org\Mxchange\CoreFramework\Stacker\Filesystem;
 
 // Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filesystem\File\BaseBinaryFile;
-use CoreFramework\Generic\UnsupportedOperationException;
-use CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator;
-use CoreFramework\Stacker\BaseStacker;
+use Org\Mxchange\CoreFramework\Factory\Filesystem\Stack\FileStackIndexFactory;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filesystem\File\BaseBinaryFile;
+use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
+use Org\Mxchange\CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator;
+use Org\Mxchange\CoreFramework\Stacker\BaseStacker;
+
+// Import SPL stuff
+use \SplFileInfo;
 
 /**
  * A general file-based stack class
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/file/class_BaseFileStack.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/stacker/file/class_BaseFileStack.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -31,7 +39,7 @@ use CoreFramework\Stacker\BaseStacker;
  * 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 BaseFileStack extends BaseStacker {
+abstract class BaseFileStack extends BaseStacker {
 	/**
 	 * Magic for this stack
 	 */
@@ -166,14 +174,14 @@ class BaseFileStack extends BaseStacker {
 	/**
 	 * Initializes this file-based stack.
 	 *
-	 * @param	$fileName	File name of this stack
+	 * @param	$fileInfoInstance	An instance of a SplFileInfo class
 	 * @param	$type		Type of this stack (e.g. url_source for URL sources)
 	 * @return	void
 	 * @todo	Currently the stack file is not cached, please implement a memory-handling class and if enough RAM is found, cache the whole stack file.
 	 */
-	protected function initFileStack ($fileName, $type) {
+	protected function initFileStack (SplFileInfo $fileInfoInstance, $type) {
 		// Get a stack file instance
-		$fileInstance = ObjectFactory::createObjectByConfiguredName('stack_file_class', array($fileName, $this));
+		$fileInstance = ObjectFactory::createObjectByConfiguredName('stack_file_class', array($fileInfoInstance, $this));
 
 		// Get iterator instance
 		$iteratorInstance = ObjectFactory::createObjectByConfiguredName('file_iterator_class', array($fileInstance));
@@ -216,7 +224,7 @@ class BaseFileStack extends BaseStacker {
 		 * Get stack index instance. This can be used for faster
 		 * "defragmentation" and startup.
 		 */
-		$indexInstance = FileStackIndexFactory::createFileStackIndexInstance($fileName, $type);
+		$indexInstance = FileStackIndexFactory::createFileStackIndexInstance($fileInfoInstance, $type);
 
 		// And set it here
 		$this->setIndexInstance($indexInstance);