X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fships%2Fclass_BaseShip.php;h=14ed9d2a7a41b7b15b615603f77d36df8c720b4b;hp=51f1559d947e4b9ed1f7c300d8b9dee68230187c;hb=2b7c3e43b2fe0f3c5ae0455d13fa7743b638049f;hpb=efba981c9bf18c733dfde945b09111ff4b6007ce

diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php
index 51f1559..14ed9d2 100644
--- a/application/ship-simu/main/ships/class_BaseShip.php
+++ b/application/ship-simu/main/ships/class_BaseShip.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -42,15 +42,11 @@ class BaseShip extends BaseSimulator {
 		// Call parent constructor
 		parent::__construct($className);
 
-		// Set object description
-		$this->setObjectDescription("Allgemeines Schiff");
-
 		// Prepare array object for all structures
 		$this->createStructuresArray();
 
 		// Clean-up a little
 		$this->removePartInstance();
-		$this->removeNumberFormaters();
 	}
 
 	// Array-Objekt anlegen
@@ -70,13 +66,13 @@ class BaseShip extends BaseSimulator {
 		));
 
 		// Ist die gewuenschte Klasse vorhanden?
-		if (class_exists($partClass)) {
-			// Get an instance back from our object factory
-			$partInstance = ObjectFactory::createObjectByName($partClass);
-		} else {
+		if (!class_exists($partClass)) {
 			// Nicht vorhanden, dann Ausnahme werfen!
 			throw new ClassNotFoundException($partClass, self::EXCEPTION_CLASS_NOT_FOUND);
-		}
+		} // END - if
+
+		// Get an instance back from our object factory
+		$partInstance = ObjectFactory::createObjectByName($partClass);
 
 		// Das Einbauen versuchen...
 		try {
@@ -127,14 +123,6 @@ class BaseShip extends BaseSimulator {
 		// Instanz im Aufbauten-Array vermerken
 		$this->structures->append($partInstance);
 
-		// Debug-Meldung ausgeben
-		if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Das Schiff <strong>%s</strong> hat das Schiffsteil <strong>%s</strong> eingebaut bekommen.",
-			__CLASS__,
-			__LINE__,
-			$this->getShipName(),
-			$partInstance->getObjectDescription()
-		));
-
 		// Alles klar!
 		return true;
 	}