X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fclass_Merchant.php;h=8f23118a3216c02cbf50fc074ca07fb98097ff52;hb=e433812994d5f9a15d2be01b271c3a46bda729ae;hp=24d21b6a093b9f24dd27f3c78d64b186ecacc535;hpb=11c0ba60cb6c044928f41e93cc98d214b1d8ad7c;p=shipsimu.git

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 24d21b6..8f23118 100644
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -4,9 +4,9 @@
  *
  * @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, 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
@@ -40,7 +40,7 @@ class Merchant extends BaseFrameworkSystem {
 		$this->setObjectDescription("H&auml;ndler");
 
 		// Generate unique ID number
-		$this->createUniqueID();
+		$this->generateUniqueId();
 
 		// Clean up a little
 		$this->removeSystemArray();
@@ -56,7 +56,7 @@ class Merchant extends BaseFrameworkSystem {
 
 		// Debug message
 		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) {
-			$merchantInstance->getDebugInstance()->output(sprintf("[%s:%d] Ein H&auml;ndler <strong>%s</strong> wird angelegt und soll sich am <strong>%s</strong> niederlassen.<br />\n",
+			$merchantInstance->getDebugInstance()->output(sprintf("[%s:%d] Ein H&auml;ndler <strong>%s</strong> wird angelegt und soll sich am <strong>%s</strong> niederlassen.",
 				__CLASS__,
 				__LINE__,
 				$merchantName,
@@ -79,57 +79,27 @@ class Merchant extends BaseFrameworkSystem {
 
 	// Initialize pricing list
 	private function createPriceList () {
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> erh&auml;lt eine leere Preisliste.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->getMerchantName()
-		));
-		$this->priceList = new FrameworkArrayObject();
+		$this->priceList = new FrameworkArrayObject("FakedPriceList");
 	}
 
 	// Setter for merchant name
 	public final function setMerchantName ($merchantName) {
-		// Secure string
-		$merchantName = (string) $merchantName;
-
 		// Debug message
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndlername <strong>%s</strong> ist nun bekannt.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$merchantName
-		));
-		$this->merchantName = $merchantName;
+		$this->merchantName = (string) $merchantName;
 	}
 
 	// Getter for merchant name
 	public final function getMerchantName () {
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndlername <strong>%s</strong> wird verlangt.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->merchantName
-		));
 		return $this->merchantName;
 	}
 
 	// Setter for harbor instance
 	public final function setHarborInstance (Harbor $harborInstance) {
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> l&auml;sst sich am <strong>%s</strong> nieder.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->getMerchantName(),
-			$harborInstance->getHarborName()
-		));
 		$this->harborInstance = $harborInstance;
 	}
 
 	// Getter for harbor instance
 	public final function getHarborInstance () {
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> hat sich am <strong>%s</strong> niedergelassen.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->getMerchantName(),
-			$harborInstance->getHarborName()
-		));
 		return $this->harborInstance;
 	}
 
@@ -139,7 +109,7 @@ class Merchant extends BaseFrameworkSystem {
 		$price = (float) $price;
 
 		// Debug message
-		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> kann nun das Schiffsteil <strong>%s</strong> &quot;<strong>%s</strong>&quot; zu <strong>%s</strong> verkaufen.<br />\n",
+		if ((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Der H&auml;ndler <strong>%s</strong> kann nun das Schiffsteil <strong>%s</strong> &quot;<strong>%s</strong>&quot; zu <strong>%s</strong> verkaufen.",
 			__CLASS__,
 			__LINE__,
 			$this->getMerchantName(),