X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fio%2Fclass_FrameworkFileOutputPointer.php;h=5fb5e7510b13581fcd339815f477b0dc750496de;hb=5fc2c45da7b1095ae800ef8060cc3b6737b58785;hp=6c555bdffbc7645701b9208cbfdc2e721de64ec6;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae;p=core.git

diff --git a/inc/classes/main/io/class_FrameworkFileOutputPointer.php b/inc/classes/main/io/class_FrameworkFileOutputPointer.php
index 6c555bdf..5fb5e751 100644
--- a/inc/classes/main/io/class_FrameworkFileOutputPointer.php
+++ b/inc/classes/main/io/class_FrameworkFileOutputPointer.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 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -25,12 +25,12 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
 	/**
 	 * The current file we are working in
 	 */
-	private $fileName = "";
+	private $fileName = '';
 
 	/**
 	 * The file pointer
 	 */
-	private $filePointer = null;
+	private $filePointer = NULL;
 
 	/**
 	 * Protected constructor
@@ -38,10 +38,6 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean-up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -65,23 +61,22 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
 	 * @param	$fileName	The file name we shall pass to fopen()
 	 * @param	$mode		The output mode ('w', 'a' are valid)
 	 * @throws	FileIsEmptyException	If the provided file name is empty.
-	 * @throws	FilePointerNotOpened	If fopen() returns not a file
-	 *									resource
+	 * @throws	FileIoException		If fopen() returns not a file resource
 	 * @return	void
 	 */
-	public final static function createFrameworkFileOutputPointer ($fileName, $mode) {
+	public static final function createFrameworkFileOutputPointer ($fileName, $mode) {
 		// Some pre-sanity checks...
 		if (is_null($fileName)) {
 			// No filename given
 			throw new FileIsEmptyException(null, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		}
+		} // END - if
 
 		// Try to open a handler
 		$filePointer = @fopen($fileName, $mode);
 		if (($filePointer === null) || ($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
 		$pointerInstance = new FrameworkFileOutputPointer();
@@ -101,7 +96,7 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
 	 * @return	mixed			The result of fwrite()
 	 * @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 writeToFile ($dataStream) {
@@ -110,7 +105,7 @@ class FrameworkFileOutputPointer 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
@@ -124,7 +119,7 @@ class FrameworkFileOutputPointer 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())) {
@@ -132,13 +127,13 @@ class FrameworkFileOutputPointer 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('');
 	}
 
 	/**
@@ -154,7 +149,7 @@ class FrameworkFileOutputPointer 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);
 		}
 	}