From 014feb51ca186f4b66edeee7dca62a190dff0564 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 8 Mar 2008 12:51:40 +0000
Subject: [PATCH] getter, setter are all final; several code clean-ups

---
 inc/classes/main/class_BaseFrameworkSystem.php     | 14 ++++++--------
 .../database/classes/class_LocalFileDatabase.php   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 1e536a2013..c1147db38a 100644
--- 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) {
-		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());
 	}
 
@@ -586,8 +581,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	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
 	 */
-	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();
 
diff --git a/inc/classes/main/database/classes/class_LocalFileDatabase.php b/inc/classes/main/database/classes/class_LocalFileDatabase.php
index 55875a6de4..231dfee213 100644
--- 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
 	 */
-	public function getObjectFromCachedData ($uniqueID) {
+	public final function getObjectFromCachedData ($uniqueID) {
 		// Get instance for file handler
 		$inputHandler = $this->getIOInstance();
 
-- 
2.39.5