Introduced CalculatableBlock + basic implementation for valid().

[core.git] / inc / classes / main / stacker / file / class_BaseFileStack.php

diff --git a/inc/classes/main/stacker/file/class_BaseFileStack.php b/inc/classes/main/stacker/file/class_BaseFileStack.php
index 56c3b99d4b7539cfce89f814448953fa90d6f68d..f6819a02deb9b5b2f8870409e121d0e72682adbb 100644 (file)
--- a/inc/classes/main/stacker/file/class_BaseFileStack.php
+++ b/inc/classes/main/stacker/file/class_BaseFileStack.php
@@ -220,7 +220,7 @@ class BaseFileStack extends BaseStacker {
                $fileInstance = ObjectFactory::createObjectByConfiguredName('stack_file_class', array($fileName));
 
                // Get iterator instance
-               $iteratorInstance = ObjectFactory::createObjectByConfiguredName('file_io_iterator_class', array($fileInstance));
+               $iteratorInstance = ObjectFactory::createObjectByConfiguredName('file_io_iterator_class', array($fileInstance, $this));
 
                // Is the instance implementing the right interface?
                assert($iteratorInstance instanceof SeekableWritableFileIterator);
@@ -254,11 +254,11 @@ class BaseFileStack extends BaseStacker {
        }
 
        /**
-        * Calculates minimum length for one entry
+        * Calculates minimum length for one entry/block
         *
-        * @return      $length         Minimum length for one entry
+        * @return      $length         Minimum length for one entry/block
         */
-       protected function caluclateMinimumFileEntryLength () {
+       public function caluclateMinimumBlockLength () {
                // Calulcate it
                $length = self::getHashLength() + strlen(self::SEPARATOR_HASH_NAME) + self::LENGTH_NAME + 1;