From 733bf5e631a31f6b742e3cd087ac921deb8e240c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 7 Dec 2014 19:56:59 +0100 Subject: [PATCH] Also this has to be renamed ('Directory' already exists). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...lass_Directory.php => class_FrameworkDirectory.php} | 2 +- inc/classes/main/class_BaseFrameworkSystem.php | 10 +++++----- .../directory/class_FrameworkDirectoryPointer.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename inc/classes/interfaces/io/directory/{class_Directory.php => class_FrameworkDirectory.php} (97%) diff --git a/inc/classes/interfaces/io/directory/class_Directory.php b/inc/classes/interfaces/io/directory/class_FrameworkDirectory.php similarity index 97% rename from inc/classes/interfaces/io/directory/class_Directory.php rename to inc/classes/interfaces/io/directory/class_FrameworkDirectory.php index 993ced24..0a069980 100644 --- a/inc/classes/interfaces/io/directory/class_Directory.php +++ b/inc/classes/interfaces/io/directory/class_FrameworkDirectory.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface Directory extends FrameworkInterface { +interface FrameworkDirectory extends FrameworkInterface { /** * Read raw lines of data from a directory pointer and return the data * diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index ae19aeb4..d5a56141 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -199,7 +199,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { private $minableInstance = NULL; /** - * A Directory instance + * A FrameworkDirectory instance */ private $directoryInstance = NULL; @@ -1325,19 +1325,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Setter for Directory instance + * Setter for FrameworkDirectory instance * * @param $directoryInstance A FrameworkDirectoryPointer instance * @return void */ - protected final function setDirectoryInstance (Directory $directoryInstance) { + protected final function setDirectoryInstance (FrameworkDirectory $directoryInstance) { $this->directoryInstance = $directoryInstance; } /** - * Getter for directory instance + * Getter for FrameworkDirectory instance * - * @return $directoryInstance A Directory instance + * @return $directoryInstance A FrameworkDirectory instance */ protected final function getDirectoryInstance () { return $this->directoryInstance; diff --git a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php index 2d075cbd..634d8a78 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 . */ -class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Directory { +class FrameworkDirectoryPointer extends BaseFrameworkSystem implements FrameworkDirectory { /** * The current path we are working in */ -- 2.30.2