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

[mailer.git] / inc / classes / main / class_BaseFrameworkSystem.php

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index c29262f1b0f63aab74671fd441fbf3dfb43e80b2..c1147db38a6ac403db7194c21d7b87b59763e6c3 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -3,12 +3,12 @@
  * The simulator system class is the super class of all other classes. This
  * class handles saving of games etc.
  *
  * The simulator system class is the super class of all other classes. This
  * class handles saving of games etc.
  *

- * @author             Roland Haeder <webmaster@mxchange.org>
+ * @author             Roland Haeder <webmaster@ship-simu.org>

  * @version            0.3.0
  * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @version            0.3.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.mxchange.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
  * the Free Software Foundation, either version 3 of the License, or
  * 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
  * the Free Software Foundation, either version 3 of the License, or


@@ -126,7 +126,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        const EXCEPTION_VARIABLE_NOT_SET             = 0x02a;
        const EXCEPTION_ATTRIBUTES_ARE_MISSING       = 0x02b;
        const EXCEPTION_ARRAY_ELEMENTS_MISSING       = 0x02c;
        const EXCEPTION_VARIABLE_NOT_SET             = 0x02a;
        const EXCEPTION_ATTRIBUTES_ARE_MISSING       = 0x02b;
        const EXCEPTION_ARRAY_ELEMENTS_MISSING       = 0x02c;

-       const EXCEPTION_NOT_CONSTRUCTABLE                       = 0x02d;

 
        /**
         * In the super constructor these system classes shall be ignored or else
 
        /**
         * In the super constructor these system classes shall be ignored or else


@@ -148,7 +147,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                "GzipCompressor",                       // GZIP compressor
                "WebOutput",                            // Web output sub-system
        );
                "GzipCompressor",                       // GZIP compressor
                "WebOutput",                            // Web output sub-system
        );

-       
+

        /**
         * Private super constructor
         *
        /**
         * Private super constructor
         *


@@ -199,7 +198,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                $this->getDebugInstance()->output(sprintf("[%s::%s] Stub! Args: %s",
                        $this->__toString(),
                        $methodName,
                $this->getDebugInstance()->output(sprintf("[%s::%s] Stub! Args: %s",
                        $this->__toString(),
                        $methodName,

-                       $argsString                     
+                       $argsString

                ));
 
                // Return nothing
                ));
 
                // Return nothing


@@ -475,7 +474,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        private final function generateIdNumber () {
                return sprintf("%s@%s",
                        $this->__toString(),
        private final function generateIdNumber () {
                return sprintf("%s@%s",
                        $this->__toString(),

-                       md5(sprintf("%s:%s:%s:%s:%s:%s", 
+                       md5(sprintf("%s:%s:%s:%s:%s:%s",

                                $this->__toString(),
                                $this->getPartDescr(),
                                time(),
                                $this->__toString(),
                                $this->getPartDescr(),
                                time(),


@@ -570,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());
        }
 


@@ -587,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()
+                       )

                );
        }
 
                );
        }
 


@@ -726,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();