X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fio%2Fclass_FrameworkDirectoryPointer.php;h=ccbb545e276c32227c1c2a4925728cf8257bbad2;hb=5bf79580029c4f6ee71e6c9e7890169e4b344def;hp=553e6336aed3b4876052f594ef53d316d765ea4e;hpb=1d128d8532290e84885d09d2d3f0060abd08e49e;p=shipsimu.git

diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index 553e633..ccbb545 100644
--- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@ -2,11 +2,11 @@
 /**
  * A class for directory reading and getting its contents
  *
- * @author		Roland Haeder <webmaster@mxchange.org>
- * @version		0.3.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @version		0.0.0
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
- * @link 		http://www.mxchange.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
@@ -39,14 +39,9 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set part description
-		$this->setObjectDescription("Verzeichnis-Handler");
-
-		// Create unique ID
-		$this->createUniqueID();
-
 		// Clean-up a little
 		$this->removeNumberFormaters();
+		$this->removeSystemArray();
 	}
 
 	/**
@@ -143,20 +138,8 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 *
 	 * @return	string	Directory and/or file names read from the current
 	 *					directory pointer
-	 * @throws	NullPointerException	If the directory pointer instance
-	 *								is not set by setPointer()
-	 * @throws	InvalidDirectoryResourceException	If there is being set
-	 *										an invalid directory resource
 	 */
 	public function readRawDirectory () {
-		if (is_null($this->getPointer())) {
-			// Pointer not initialized
-			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} elseif (!is_resource($this->getPointer())) {
-			// Pointer is not a valid resource!
-			throw new InvalidDirectoryResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
-		}
-
 		// Read data from the directory pointer and return it
 		return readdir($this->getPointer());
 	}
@@ -197,19 +180,8 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * to empty
 	 *
 	 * @return	void
-	 * @throws	NullPointerException	If the directory pointer instance
-	 *								is not set by setPointer()
-	 * @throws	InvalidDirectoryResourceException	If there is being set
 	 */
 	public function closeDirectory () {
-		if (is_null($this->getPointer())) {
-			// Pointer not initialized
-			return;
-		} elseif (!is_resource($this->getPointer())) {
-			// Pointer is not a valid resource!
-			throw new InvalidDirectoryResourceException($this, self::EXCEPTION_INVALID_DIRECTORY_POINTER);
-		}
-
 		// Close the directory pointer and reset the instance variable
 		@closedir($this->getPointer());
 		$this->setPointer(null);
@@ -223,7 +195,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * @return	void
 	 */
 	public final function setPointer ($dirPointer) {
-		// Sanity-check if the pointer is a valid directory resource
+		// Sanity-check if pointer is a valid directory resource
 		if (is_resource($dirPointer) || is_null($dirPointer)) {
 			// Is a valid resource
 			$this->dirPointer = $dirPointer;