More renamed

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

diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php
index 6f78c65071fb6a89128f17e545c5511f7b80e44c..8e08ec3556f335fd2f075b53b91c117134c0484f 100644 (file)
--- a/application/ship-simu/main/class_BasePersonell.php
+++ b/application/ship-simu/main/class_BasePersonell.php
@@ -1,5 +1,26 @@
 <?php
-// What every kind of personell have
+/**
+ * A general class for personell
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
 class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        // Maximum/minimum age
        private $MIN_AGE = 21;
@@ -27,28 +48,13 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        private $salary     = 0.00;
 
        // Constructor
-       private function __construct ($class) {
+       protected function __construct ($className) {
                // Call parent constructor
-               parent::constructor($class);
-
-               // Debug message
-               if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
-
-               // Beschreibung setzen
-               $this->setPartDescr("Personal");
-       }
-
-       // Calls the constructor
-       public function constructor ($class) {
-               $this->__construct($class);
+               parent::__construct($className);
        }
 
        // Remove min/max ages
        public final function removeMinMaxAge () {
-               if (defined('DEBUG_PERSONELL')) $this->getDebugInstance()->output(sprintf("[%s:%d] Minimum-/Maximum-Alter entfernt.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
                unset($this->MIN_AGE);
                unset($this->MAX_AGE);
        }
@@ -65,7 +71,7 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
                $year = mt_rand(($currYear - $this->MIN_AGE), ($currYear - $this->MAX_AGE));
                $month = 0;
                $day = 0;
-               while (!$this->isDateValid($year, $month, $day)) {
+               while ($this->isDateValid($year, $month, $day) === false) {
                        $month = mt_rand(1, 12);
                        switch ($month) {
                        case 1:
@@ -94,8 +100,8 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
                                        $day = mt_rand(1, 28);
                                }
                                break;
-                       } // switch - END
-               } // while - END
+                       } // END - switch
+               } // END - while
 
                // Set the new birthday
                $this->setBirthday($year, $month, $day);
@@ -203,35 +209,35 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        }
 
        // Remove gender
-       public function removeGender () {
+       public final function removeGender () {
                unset($this->gender);
        }
 
        // Remove both names
-       public function removeNames () {
+       public final function removeNames () {
                unset($this->surname);
                unset($this->family);
        }
 
        // Remove complete birthday
-       public function removeBirthday () {
+       public final function removeBirthday () {
                unset($this->yearBirth);
                unset($this->monthBirth);
                unset($this->dayBirth);
        }
 
        // Remove salary
-       public function removeSalary () {
+       public final function removeSalary () {
                unset($this->salary);
        }
 
        // Remove employment status
-       public function removeEmployed () {
+       public final function removeEmployed () {
                unset($this->employed);
        }
 
        // Remove marrital status
-       public function removeMarried () {
+       public final function removeMarried () {
                unset($this->married);
        }
 }