getter, setter are all final; several code clean-ups

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 1e536a2013a172414ec2ea65d9063178d7030757..c1147db38a6ac403db7194c21d7b87b59763e6c3 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -569,11 +569,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @return      boolean The result of comparing both's unique ID
         */
        public final function equals ($object) {
         * @return      boolean The result of comparing both's unique ID
         */
        public final function equals ($object) {

-               if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Ist <strong>%s</strong>=<strong>%s</strong>?<br />\n",
-                       $this->__toString(),
-                       $this->__toString(),
-                       $object->__toString()
-               ));

                return ($this->getUniqueID() == $object->getUniqueID());
        }
 
                return ($this->getUniqueID() == $object->getUniqueID());
        }
 


@@ -586,8 +581,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        public function itemMatches ($itemInstance) {
                return (
         */
        public function itemMatches ($itemInstance) {
                return (

-                          ($this->__toString()   == $itemInstance->__toString())
-                       && ($this->getPartDescr() == $itemInstance->getPartDescr())
+                       (
+                               $this->__toString()   == $itemInstance->__toString()
+                       ) && (
+                               $this->getPartDescr() == $itemInstance->getPartDescr()
+                       )

                );
        }
 
                );
        }
 


@@ -725,7 +723,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @throws      InvalidArrayCountException      If the array contains less or
         *                                                                      more than two elements
         */
         * @throws      InvalidArrayCountException      If the array contains less or
         *                                                                      more than two elements
         */

-       public function getPathFileNameFromObject () {
+       public final function getPathFileNameFromObject () {

                // Get the main object's unique ID. We use this as a path/filename combination
                $pathFile = $this->getUniqueID();
 
                // Get the main object's unique ID. We use this as a path/filename combination
                $pathFile = $this->getUniqueID();
 

diff --git a/inc/classes/main/database/classes/class_LocalFileDatabase.php b/inc/classes/main/database/classes/class_LocalFileDatabase.php
index 55875a6de485ef9f38ad3e14e33dde83fc406677..231dfee213994edc114b4f10a76fad8070f91910 100644 (file)
--- a/inc/classes/main/database/classes/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/classes/class_LocalFileDatabase.php
@@ -404,7 +404,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         * @throws      MissingMethodException                  If the required method
         *                                                                              toString() is missing
         */
         * @throws      MissingMethodException                  If the required method
         *                                                                              toString() is missing
         */

-       public function getObjectFromCachedData ($uniqueID) {
+       public final function getObjectFromCachedData ($uniqueID) {

                // Get instance for file handler
                $inputHandler = $this->getIOInstance();
 
                // Get instance for file handler
                $inputHandler = $this->getIOInstance();