Some minor rewrites

[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 b296421bfbdcb86474f037db8dfc2764bb90bf35..c7a6ad178902b1bc5be94fb430c27676f95fb4db 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, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -30,7 +30,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
        /**
         * The file pointer
         */
-       private $filePointer = null;
+       private $filePointer = NULL;
 
        /**
         * Protected constructor
@@ -64,18 +64,17 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
         *
         * @param               $fileName       The file name we shall pass to fopen()
         * @throws      FileIsEmptyException    If the provided file name is empty.
-        * @throws      FilePointerNotOpenedException   If fopen() returns not a
-        *                                                                                      file resource
+        * @throws      FileIoException         If fopen() returns not a file resource
         * @return      void
         */
-       public final static function createFrameworkFileInputPointer ($fileName) {
+       public static final function createFrameworkFileInputPointer ($fileName) {
                // Some pre-sanity checks...
                if ((is_null($fileName)) || (empty($fileName))) {
                        // No filename given
                        throw new FileIsEmptyException(null, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
                } elseif (!file_exists($fileName)) {
                        // File does not exist!
-                       throw new FileNotFoundException($fileName, self::EXCEPTION_FILE_NOT_FOUND);
+                       throw new FileIoException($fileName, self::EXCEPTION_FILE_NOT_FOUND);
                } elseif (!is_readable($fileName)) {
                        // File does not exist!
                        throw new FileReadProtectedException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
@@ -85,7 +84,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
                $filePointer = @fopen($fileName, 'rb');
                if ((is_null($filePointer)) || ($filePointer === false)) {
                        // Something bad happend
-                       throw new FilePointerNotOpenedException ($fileName, self::EXCEPTION_FILE_POINTER_INVALID);
+                       throw new FileIoException($fileName, self::EXCEPTION_FILE_POINTER_INVALID);
                } // END - if
 
                // Create new instance
@@ -163,7 +162,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
 
                // Close the file pointer and reset the instance variable
                @fclose($this->getPointer());
-               $this->setPointer(null);
+               $this->setPointer(NULL);
                $this->setFileName('');
        }