X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fio%2Fclass_FrameworkFileInputPointer.php;h=0e070be17fc46d2e8e5c530706ee6a8a215acc54;hb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9;hp=a38b0a3d1d08e83270157aef05370ee931c9990f;hpb=b912eda46059527fc0475e043944c3ebff47fbcd;p=shipsimu.git

diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php
index a38b0a3..0e070be 100644
--- a/inc/classes/main/io/class_FrameworkFileInputPointer.php
+++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php
@@ -2,11 +2,11 @@
 /**
  * A class for reading files
  *
- * @author		Roland Haeder <webmaster@mxchange.org>
+ * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
- * @link 		http://www.ship-simu.org
+ * @link		http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,10 +40,10 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
 		parent::__construct(__CLASS__);
 
 		// Set part description
-		$this->setObjectDescription("Dateiausgabe-Handler");
+		$this->setObjectDescription("Handler for reading from files");
 
 		// Create unique ID
-		$this->createUniqueID();
+		$this->generateUniqueId();
 
 		// Clean-up a little
 		$this->removeNumberFormaters();
@@ -76,17 +76,23 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
 	 */
 	public final static function createFrameworkFileInputPointer ($fileName) {
 		// Some pre-sanity checks...
-		if (is_null($fileName)) {
+		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);
+		} elseif (!is_readable($fileName)) {
+			// File does not exist!
+			throw new FileReadProtectedException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
 		}
 
 		// Try to open a handler
 		$filePointer = @fopen($fileName, 'rb');
-		if (($filePointer === null) || ($filePointer === false)) {
+		if ((is_null($filePointer)) || ($filePointer === false)) {
 			// Something bad happend
 			throw new FilePointerNotOpenedException ($fileName, self::EXCEPTION_FILE_POINTER_INVALID);
-		}
+		} // END - if
 
 		// Create new instance
 		$pointerInstance = new FrameworkFileInputPointer();