Debugging continued:

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

diff --git a/inc/main/classes/file_directories/class_BaseAbstractFile.php b/inc/main/classes/file_directories/class_BaseAbstractFile.php
index e26c58bbcefd3b06b4c8364a6b902e8fafa889f9..a4f718dccf51b29039c86e3b86d10b2a8957b305 100644 (file)
--- a/inc/main/classes/file_directories/class_BaseAbstractFile.php
+++ b/inc/main/classes/file_directories/class_BaseAbstractFile.php
@@ -1,10 +1,16 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\File;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An abstract file class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -21,7 +27,7 @@
  * 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 BaseAbstractFile extends BaseFrameworkSystem {
+class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, CloseableFile {
        /**
         * Counter for total entries
         */
@@ -133,9 +139,9 @@ class BaseAbstractFile extends BaseFrameworkSystem {
         *
         * @return      void
         */
-       private function closeFile () {
+       public function closeFile () {
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d]: fileName=%s - CALLED!', __METHOD__, __LINE__, $this->getFileName()));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: fileName=%s - CALLED!', __METHOD__, __LINE__, $this->getFileName()));
 
                // Close down pointer instance as well by unsetting it
                $this->unsetPointerInstance();
@@ -144,7 +150,7 @@ class BaseAbstractFile extends BaseFrameworkSystem {
                $this->setFileName('');
 
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d]: EXIT!', __METHOD__, __LINE__));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d]: EXIT!', __METHOD__, __LINE__));
        }
 
        /**
@@ -195,7 +201,5 @@ class BaseAbstractFile extends BaseFrameworkSystem {
                // Call pointer instance
                return $this->getPointerInstance()->isEndOfFileReached();
        }
-}
 
-// [EOF]
-?>
+}