X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffile_directories%2Fdirectory%2Fclass_FrameworkDirectoryPointer.php;h=d2f47d3c93a8649fc0d5daa351afcabf0444d592;hp=b23ee13a5a901e5a2922b4aa165eca4845e7575c;hb=88edbab806256235ce080fc18d6602061777a6ba;hpb=def2a95907c40b71343061188f49ccbe1b8c7f20;ds=sidebyside

diff --git a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
index b23ee13a..d2f47d3c 100644
--- a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class FrameworkDirectoryPointer extends BaseFrameworkSystem {
+class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Directory {
 	/**
 	 * The current path we are working in
 	 */
@@ -30,7 +30,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * The directory iterator instance
 	 */
-	private $directoryInstance = NULL;
+	private $iteratorInstance = NULL;
 
 	/**
 	 * Protected constructor
@@ -45,7 +45,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 */
 	public function __destruct() {
 		// Is there a resource pointer? Then we have to close the directory here!
-		if ($this->getDirectoryInstance() instanceof DirectoryIterator) {
+		if ($this->getIteratorInstance() instanceof DirectoryIterator) {
 			// Try to close a directory
 			$this->closeDirectory();
 		} // END - if
@@ -103,13 +103,13 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		$pointerInstance = new FrameworkDirectoryPointer();
 
 		// Get an iterator for the directory
-		$directoryInstance = new DirectoryIterator($pathName);
+		$iteratorInstance = new DirectoryIterator($pathName);
 
 		// ... and rewind back
-		$directoryInstance->rewind();
+		$iteratorInstance->rewind();
 
 		// Set directory pointer and path name
-		$pointerInstance->setDirectoryInstance($directoryInstance);
+		$pointerInstance->setIteratorInstance($iteratorInstance);
 		$pointerInstance->setPathName($pathName);
 
 		// Return the instance
@@ -126,13 +126,13 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . '] - CALLED!');
 
 		// Can the next entry be read?
-		assert($this->getDirectoryInstance()->valid());
+		assert($this->getIteratorInstance()->valid());
 
 		// Default is FALSE
 		$currentEntry = FALSE;
 
 		// Read data from the directory pointer and return it
-		$currentEntry = $this->getDirectoryInstance()->current();
+		$currentEntry = $this->getIteratorInstance()->current();
 
 		// Return found entry
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: currentEntry[]=' . gettype($currentEntry) . ' - EXIT!');
@@ -151,7 +151,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 			// No exception given, so read all files and directories, but not recursive
 			self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: No exceptions given, please use readRawDirectory() instead!');
 			return $this->readRawDirectory();
-		} elseif (!$this->getDirectoryInstance()->valid()) {
+		} elseif (!$this->getIteratorInstance()->valid()) {
 			// No more left to read
 			return NULL;
 		}
@@ -172,7 +172,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 			// Is it not excluded?
 			if (in_array($rawLine, $except)) {
 				// To next entry
-				$this->getDirectoryInstance()->next();
+				$this->getIteratorInstance()->next();
 
 				// Exclude this part
 				$rawLine = $this->readDirectoryExcept($except);
@@ -181,7 +181,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		} // END - if
 
 		// To next entry
-		$this->getDirectoryInstance()->next();
+		$this->getIteratorInstance()->next();
 
 		// Return read line
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
@@ -196,28 +196,28 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 */
 	public function closeDirectory () {
 		// Close the directory by unsetting it
-		$this->setDirectoryInstance(NULL);
+		$this->setIteratorInstance(NULL);
 		$this->setPathName('');
 	}
 
 	/**
 	 * Setter for the directory pointer
 	 *
-	 * @param	$directoryInstance	An instanceof a DirectoryIterator class or NULL to unset ("close") it.
+	 * @param	$iteratorInstance	An instanceof a DirectoryIterator class or NULL to unset ("close") it.
 	 * @return	void
 	 */
-	protected final function setDirectoryInstance (DirectoryIterator $directoryInstance = NULL) {
+	protected final function setIteratorInstance (DirectoryIterator $iteratorInstance = NULL) {
 		// Set instance (or NULL)
-		$this->directoryInstance = $directoryInstance;
+		$this->iteratorInstance = $iteratorInstance;
 	}
 
 	/**
 	 * Getter for the directory pointer
 	 *
-	 * @return	$directoryInstance	The directory pointer which shall be a valid directory resource
+	 * @return	$iteratorInstance	The directory pointer which shall be a valid directory resource
 	 */
-	public final function getDirectoryInstance () {
-		return $this->directoryInstance;
+	public final function getIteratorInstance () {
+		return $this->iteratorInstance;
 	}
 
 	/**
@@ -226,7 +226,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * @param	$pathName	The new path name
 	 * @return	void
 	 */
-	public final function setPathName ($pathName) {
+	protected final function setPathName ($pathName) {
 		$pathName = (string) $pathName;
 		$this->pathName = $pathName;
 	}