Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php
index c4a548b3f8908a66198e26d4fa3ad45a021170b1..d4ffee9871458b9ce53bb30868ed38f9f35dfd2b 100644 (file)
--- a/application/ship-simu/main/ships/class_BaseShip.php
+++ b/application/ship-simu/main/ships/class_BaseShip.php
@@ -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 BaseShip extends BaseSimulator {
        // Name des Shipes
@@ -38,9 +38,9 @@ class BaseShip extends BaseSimulator {
        private $structures = null;
 
        // Namenloses Ship generieren
-       private function __construct($class) {
+       protected function __construct($class) {
                // Call parent constructor
-               parent::constructor($class);
+               parent::__construct($class);
 
                // Beim Schiff angelangt
                if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT')))
@@ -50,7 +50,7 @@ class BaseShip extends BaseSimulator {
                        ));
 
                // Bezeichnung setzen
-               $this->setPartDescr("Schiff");
+               $this->setObjectDescription("Schiff");
 
                // Array-Objekt generieren
                $this->createStructuresArray();
@@ -60,16 +60,6 @@ class BaseShip extends BaseSimulator {
                $this->removeNumberFormaters();
        }
 
-       /**
-        * Calls the private constructor
-        *
-        * @param       $class  The class' name
-        * @return      void
-        */
-       public function constructor ($class) {
-               $this->__construct($class);
-       }
-
        // Array-Objekt anlegen
        private function createStructuresArray () {
                $this->structures = new FrameworkArrayObject();
@@ -175,7 +165,7 @@ class BaseShip extends BaseSimulator {
                        __CLASS__,
                        __LINE__,
                        $this->getShipName(),
-                       $partInstance->getPartDescr()
+                       $partInstance->getObjectDescription()
                ));
 
                // Alles klar!