Type-hints fixed, header docs fixed, exceptions deprecated

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

diff --git a/application/ship-simu/main/parts/class_BaseShipPart.php b/application/ship-simu/main/parts/class_BaseShipPart.php
index f2096525ad42c7b603b953e49ad29255234f9800..014b4cba335009f2bb72c595c91055c4b644bf34 100644 (file)
--- a/application/ship-simu/main/parts/class_BaseShipPart.php
+++ b/application/ship-simu/main/parts/class_BaseShipPart.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,42 +19,24 @@
  * 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 BaseShipPart extends BaseSimulator {
        // Price of this ship part
        private $price = 0.00;
 
        // Konstruktor
-       private function __construct($class) {
+       protected function __construct($className) {
                // Call parent constructor
-               parent::constructor($class);
-
-               // Debug message
-               if (((defined('DEBUG_SHIPPART')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
-                       $this->getDebugInstance()->output(sprintf("[%s:%d:] Kontruktor erreicht.<br />\n",
-                               __CLASS__,
-                               __LINE__
-                       ));
-               }
+               parent::__construct($className);
 
                // Beschreibung
-               $this->setPartDescr("Schiffsteil");
+               $this->setObjectDescription("Schiffsteil");
 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
-       /**
-        * Calls the private constructor
-        *
-        * @param       $class  The class' name
-        * @return      void
-        */
-       public function constructor ($class) {
-               $this->__construct($class);
-       }
-
        // Setter for price
        public final function setPrice ($price) {
                $this->price = (float) $price;
@@ -66,7 +48,7 @@ class BaseShipPart extends BaseSimulator {
        }
 
        // Remove price
-       public function removePrice () {
+       public final function removePrice () {
                unset($this->price);
        }
 }