Method constructor() removed, several small fixes

[shipsimu.git] / application / ship-simu / main / personell / class_SimulatorPersonell.php

diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php
index f04a029070d822c4d6b4133fe25b084a4890a624..d5aa01e4c26329227d7df4d3b5485370b92b0191 100644 (file)
--- a/application/ship-simu/main/personell/class_SimulatorPersonell.php
+++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class SimulatorPersonell extends BasePersonell {
        // Personell list
@@ -32,20 +32,20 @@ class SimulatorPersonell extends BasePersonell {
        private $cacheCond = null;
 
        /**
-        * Private constructor
+        * Protected constructor
         *
         * @return      void
         */
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                if (((defined('DEBUG_PERSONELL')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",
                        $this->__toString()
                ));
 
                // Set description
-               $this->setPartDescr("Simulationspersonal");
+               $this->setObjectDescription("Simulationspersonal");
 
                // Create unique ID
                $this->createUniqueID();
@@ -78,7 +78,7 @@ class SimulatorPersonell extends BasePersonell {
         * @return      $personellInstance              An instance of this object with a
         *                                                              list of personells
         */
-       public static function createSimulatorPersonell ($amountPersonell) {
+       public final static function createSimulatorPersonell ($amountPersonell) {
                // Make sure only integer can pass
                $amountPersonell = (int) $amountPersonell;
 
@@ -338,7 +338,7 @@ class SimulatorPersonell extends BasePersonell {
         * @param               $cacheList      The new cache list to set or null for initialization/reset
         * @return      void
         */
-       private function setAllCacheList (FrameworkArrayObject $cacheList = null) {
+       private final function setAllCacheList (FrameworkArrayObject $cacheList = null) {
                $this->cacheList = $cacheList;
        }
 
@@ -348,7 +348,7 @@ class SimulatorPersonell extends BasePersonell {
         * @param               $cacheCond      The new cache conditions to set
         * @return      void
         */
-       private function setCacheCond ($cacheCond) {
+       private final function setCacheCond ($cacheCond) {
                $this->cacheCond = (string) $cacheCond;
        }