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

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 24d21b6..bb321d6 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, 2009 Ship-Simu Developer Team
  * @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
@@ -36,12 +36,6 @@ class Merchant extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set description
-		$this->setObjectDescription("H&auml;ndler");
-
-		// Generate unique ID number
-		$this->createUniqueID();
-
 		// Clean up a little
 		$this->removeSystemArray();
 	}
@@ -56,7 +50,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->debugOutput(sprintf("[%s:%d] Ein H&auml;ndler <strong>%s</strong> wird angelegt und soll sich am <strong>%s</strong> niederlassen.",
 				__CLASS__,
 				__LINE__,
 				$merchantName,
@@ -79,110 +73,38 @@ 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;
 	}
 
 	// Add new item to merchant's price list
 	public function addItemToPriceList (TradeableItem $itemInstance, $price) {
-		// Secure pricing
-		$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",
-			__CLASS__,
-			__LINE__,
-			$this->getMerchantName(),
-			$itemInstance->__toString(),
-			$itemInstance->getObjectDescription(),
-			$this->formatCurrency($price)
-		));
-
-		// Construct pricing item and add it to the list
-		$this->priceList->append(array(
-			'item'  => $itemInstance,
-			'price' => $price
-		));
-
-		// Remove price attribute
-		$itemInstance->removePrice();
+		$this->makeDeprecated();
 	}
 
 	// Get a price from the merchant's list
 	public final function getPriceFromList (TradeableItem $itemInstance) {
-		$price = 0;
-
-		// Iterate throw whole list
-		for ($iter = $this->priceList->getIterator(); $iter->valid(); $iter->next()) {
-			// Get current item
-			$item = $iter->current();
-
-			// Does this item match? The unique ID may not work...
-			if ($item['item']->itemMatches($itemInstance)) {
-				// Extract price and stop searching
-				$price = $item['price'];
-				break;
-			}
-		}
-
-		// Was the item found?
-		if ($price === 0) {
-			// Throw exception
-			throw new ItemNotInPriceListException($itemInstance, self::EXCEPTION_ITEM_NOT_IN_PRICE_LIST);
-		}
-
-		// Return price
-		return $price;
+		$this->makeDeprecated();
 	}
 }