Rewritten:

[core.git] / framework / main / classes / file_directories / class_BaseAbstractFile.php

diff --git a/framework/main/classes/file_directories/class_BaseAbstractFile.php b/framework/main/classes/file_directories/class_BaseAbstractFile.php
index a702c683abf8f9a3c63bb25a155145de89adc8c8..00392749629bcee8b0e45045269faf92dc796ac2 100644 (file)
--- a/framework/main/classes/file_directories/class_BaseAbstractFile.php
+++ b/framework/main/classes/file_directories/class_BaseAbstractFile.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Filesystem\File;
 // Import framework stuff
 use CoreFramework\Filesystem\CloseableFile;
 use CoreFramework\Filesystem\FilePointer;
+use CoreFramework\Generic\UnsupportedOperationException;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
@@ -35,11 +36,6 @@ class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, Close
         */
        private $totalEntries = 0;
 
-       /**
-        * The current file we are working in
-        */
-       private $fileName = '';
-
        /**
         * Protected constructor
         *
@@ -106,35 +102,15 @@ class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, Close
        }
 
        /**
-        * Getter for the file pointer
+        * Getter for the file object
         *
-        * @return      $filePointer    The file pointer which shall be a valid file resource
+        * @return      $fileObject             An instance of a SplFileObject
         * @throws      UnsupportedOperationException   If this method is called
         */
-       public final function getPointer () {
+       public final function getFileObject () {
                throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
        }
 
-       /**
-        * Setter for file name
-        *
-        * @param       $fileName       The new file name
-        * @return      void
-        */
-       protected final function setFileName ($fileName) {
-               $fileName = (string) $fileName;
-               $this->fileName = $fileName;
-       }
-
-       /**
-        * Getter for file name
-        *
-        * @return      $fileName       The current file name
-        */
-       public final function getFileName () {
-               return $this->fileName;
-       }
-
        /**
         * Close a file source and set it's instance to null and the file name
         * to empty
@@ -143,14 +119,11 @@ class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, Close
         */
        public function closeFile () {
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: fileName=%s - CALLED!', __METHOD__, __LINE__, $this->getFileName()));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: CALLED!', __METHOD__, __LINE__));
 
                // Close down pointer instance as well by unsetting it
                $this->unsetPointerInstance();
 
-               // Remove file name
-               $this->setFileName('');
-
                // Debug message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: EXIT!', __METHOD__, __LINE__));
        }
@@ -183,7 +156,7 @@ class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, Close
         * Write data to a file pointer
         *
         * @param       $dataStream             The data stream we shall write to the file
-        * @return      mixed                   Number of writes bytes or FALSE on error
+        * @return      mixed                   Number of writes bytes or false on error
         * @throws      NullPointerException    If the file pointer instance
         *                                                                      is not set by setPointer()
         * @throws      InvalidResourceException        If there is being set