'public static final' is correct

[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 21fab3f206a18df4c2b473637aa52fac93538041..ba7883f7264edc55b4991d4acefbee0070c50455 100644 (file)
--- a/application/ship-simu/main/personell/class_SimulatorPersonell.php
+++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -54,7 +54,6 @@ class SimulatorPersonell extends BasePersonell {
                $this->removePersonellList();
                $this->removeMinMaxAge();
                $this->removeCache();
-               $this->removeSystemArray();
        }
 
        /**
@@ -65,7 +64,7 @@ class SimulatorPersonell extends BasePersonell {
         * @return      $personellInstance              An instance of this object with a
         *                                                              list of personells
         */
-       public final static function createSimulatorPersonell ($amountPersonell) {
+       public static final function createSimulatorPersonell ($amountPersonell) {
                // Make sure only integer can pass
                $amountPersonell = (int) $amountPersonell;
 
@@ -101,9 +100,7 @@ class SimulatorPersonell extends BasePersonell {
                $personellInstance->removeSalary();
                $personellInstance->removeEmployed();
                $personellInstance->removeMarried();
-               $personellInstance->removeNumberFormaters();
                //$personellInstance->removeCache();
-               $personellInstance->removeSystemArray();
 
                // Instanz zurueckgeben
                return $personellInstance;
@@ -120,7 +117,7 @@ class SimulatorPersonell extends BasePersonell {
         * @throws      MissingSimulatorIdException             If an ID number was not found
         * @deprecated
         */
-       public final static function createSimulatorPersonellByID ($idNumber) {
+       public static final function createSimulatorPersonellByID ($idNumber) {
                // Get instance
                $personellInstance = new SimulatorPersonell(false);
                $personellInstance->makeDeprecated();
@@ -164,7 +161,6 @@ class SimulatorPersonell extends BasePersonell {
                $personellInstance->removePersonellList();
                $personellInstance->removeMinMaxAge();
                $personellInstance->removeCache();
-               $personellInstance->removeSystemArray();
 
                // Add new member to the list
                $this->personellList->append($personellInstance);