X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fclass_Merchant.php;h=e993c2d53038db001af31a46cc90fccf009c7f55;hp=c40f23678dd6ab69c9270b98a19bdfc34bf001df;hb=55b327a3f5f2fe1d244532e07be7444e94b2a768;hpb=243934eb16b793ebd8cb0e43a968e17175ec5a75

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index c40f236..e993c2d 100644
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.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 Merchant extends BaseFrameworkSystem {
 	// Name des Haendlers
@@ -32,23 +32,15 @@ class Merchant extends BaseFrameworkSystem {
 	private $harborInstance = null;
 
 	// Konstruktor
-	private function __construct () {
+	protected function __construct () {
 		// Call parent constructor
-		parent::constructor(__CLASS__);
-
-		// Debug message
-		if (((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
-			$this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
-				__CLASS__,
-				__LINE__
-			));
-		}
+		parent::__construct(__CLASS__);
 
 		// Set description
-		$this->setPartDescr("H&auml;ndler");
+		$this->setObjectDescription("H&auml;ndler");
 
 		// Generate unique ID number
-		$this->createUniqueID();
+		$this->generateUniqueId();
 
 		// Clean up a little
 		$this->removeSystemArray();
@@ -92,7 +84,7 @@ class Merchant extends BaseFrameworkSystem {
 			__LINE__,
 			$this->getMerchantName()
 		));
-		$this->priceList = new FrameworkArrayObject();
+		$this->priceList = new FrameworkArrayObject("FakedPriceList");
 	}
 
 	// Setter for merchant name
@@ -152,7 +144,7 @@ class Merchant extends BaseFrameworkSystem {
 			__LINE__,
 			$this->getMerchantName(),
 			$itemInstance->__toString(),
-			$itemInstance->getPartDescr(),
+			$itemInstance->getObjectDescription(),
 			$this->formatCurrency($price)
 		));
 
@@ -192,16 +184,6 @@ class Merchant extends BaseFrameworkSystem {
 		// Return price
 		return $price;
 	}
-
-	/**
-	 * Stub!
-	 */
-	public function saveObjectToDatabase () {
-		$this->getDebugInstance()->output(sprintf("[%s:] Stub <strong>%s</strong> erreicht.",
-			$this->__toString(),
-			__FUNCTION__
-		));
-	}
 }
 
 // [EOF]