Type-hints fixed, header docs fixed, exceptions deprecated

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

diff --git a/application/ship-simu/main/drives/class_BaseDrive.php b/application/ship-simu/main/drives/class_BaseDrive.php
index ce8d9e4c348d24a1c569cf679a8b49872161a03b..4891d7354c735101b63cbbfb846b6434ba374e5d 100644 (file)
--- a/application/ship-simu/main/drives/class_BaseDrive.php
+++ b/application/ship-simu/main/drives/class_BaseDrive.php
@@ -6,7 +6,7 @@
  * @version            0.0.0
  * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.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
@@ -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 BaseDrive extends BaseSimulator {
        // Price of this drive
@@ -30,36 +30,18 @@ class BaseDrive extends BaseSimulator {
        private $numCams    = 0;
 
        // Konstruktor
-       private function __construct ($class) {
+       protected function __construct ($className) {
                // Call parent constructor
-               parent::constructor($class);
-
-               // Debug message
-               if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
-                       $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
-                               __CLASS__,
-                               __LINE__
-                       ));
-               }
+               parent::__construct($className);
 
                // Set description
-               $this->setPartDescr("Namenloser Antrieb");
+               $this->setObjectDescription("Namenloser Antrieb");
 
                // Clean up a little
                $this->removeNumberFormaters();
                $this->removePartInstance();
        }
 
-       /**
-        * Calls the private constructor
-        *
-        * @param       $class  The class' name
-        * @return      void
-        */
-       public function constructor ($class) {
-               $this->__construct($class);
-       }
-
        // Setter-Methode fuert PS-Zahl
        public final function setHorsePower ($hp) {
                if ((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Antriebsleistung wird auf <strong>%d</strong> PS gesetzt.<br />\n",
@@ -90,7 +72,7 @@ class BaseDrive extends BaseSimulator {
                return $this->price;
        }
 
-       public function removePrice () {
+       public final function removePrice () {
                unset($this->price);
        }
 }