Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
index 970017b0cee96d60f7cfaa9653441ee7c4a648b3..b97f70c7d6e75e0e38ea910040ea0287729d5269 100644 (file)
--- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php
+++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
@@ -19,16 +19,16 @@
  * 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 CompanyEmployee extends SimulatorPersonell {
        // Employeee list
        private $employeeList = null;
 
        // Constructor
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                // Debug message
                if ((((defined('DEBUG_COMPANY_EMPLOYEE')) && (defined('DEBUG_PERSONELL'))) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -39,7 +39,7 @@ class CompanyEmployee extends SimulatorPersonell {
                }
 
                // Set description
-               $this->setPartDescr("Firmenangestellte(r)");
+               $this->setObjectDescription("Firmenangestellte(r)");
 
                // Create unique ID
                $this->createUniqueID();
@@ -49,7 +49,7 @@ class CompanyEmployee extends SimulatorPersonell {
        }
 
        // Generate a specified amount of personell
-       public static function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) {
+       public final static function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) {
                // Get instance
                $personellInstance = new CompanyEmployee();