State (see State Pattern) prepared, a lot reworked/refactured

[core.git] / inc / classes / main / io / class_FrameworkFileInputPointer.php

diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php
index ad16db1ffd0aa1fa6093e3a81bd3591caf906566..b296421bfbdcb86474f037db8dfc2764bb90bf35 100644 (file)
--- a/inc/classes/main/io/class_FrameworkFileInputPointer.php
+++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -25,7 +25,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
        /**
         * The current file we are working in
         */
-       private $fileName = "";
+       private $fileName = '';
 
        /**
         * The file pointer
@@ -40,10 +40,6 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean-up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -109,7 +105,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
         * @return      mixed   The result of fread()
         * @throws      NullPointerException    If the file pointer instance
         *                                                                      is not set by setPointer()
-        * @throws      InvalidFileResourceException    If there is being set
+        * @throws      InvalidResourceException        If there is being set
         *                                                                      an invalid file resource
         */
        public function readFromFile () {
@@ -118,7 +114,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
                        throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                } elseif (!is_resource($this->getPointer())) {
                        // Pointer is not a valid resource!
-                       throw new InvalidFileResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
+                       throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
                }
 
                // Read data from the file pointer and return it
@@ -131,7 +127,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
         * @return      mixed   The result of fread()
         * @throws      NullPointerException    If the file pointer instance
         *                                                                      is not set by setPointer()
-        * @throws      InvalidFileResourceException    If there is being set
+        * @throws      InvalidResourceException        If there is being set
         *                                                                      an invalid file resource
         */
        public function readLinesFromFile () {
@@ -140,7 +136,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
                        throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                } elseif (!is_resource($this->getPointer())) {
                        // Pointer is not a valid resource!
-                       throw new InvalidFileResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
+                       throw new InvalidResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
                }
 
                // Read data from the file pointer and return it
@@ -154,7 +150,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
         * @return      void
         * @throws      NullPointerException    If the file pointer instance
         *                                                                      is not set by setPointer()
-        * @throws      InvalidFileResourceException    If there is being set
+        * @throws      InvalidResourceException        If there is being set
         */
        public function closeFile () {
                if (is_null($this->getPointer())) {
@@ -162,13 +158,13 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
                        throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                } elseif (!is_resource($this->getPointer())) {
                        // Pointer is not a valid resource!
-                       throw new InvalidFileResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
+                       throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
                }
 
                // Close the file pointer and reset the instance variable
                @fclose($this->getPointer());
                $this->setPointer(null);
-               $this->setFileName("");
+               $this->setFileName('');
        }
 
        /**
@@ -184,7 +180,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
                        $this->filePointer = $filePointer;
                } else {
                        // Throw exception
-                       throw new InvalidFileResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
+                       throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
                }
        }