X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fclass_Merchant.php;h=4d2926e7186a90028a322d242d694bdf0ccc0dc3;hb=bbe0144cf869f6e2b299e3f327ff2af5cca85be4;hp=fc3d86076c841fbb465eea98a630602ec029d977;hpb=b3e47fb693fb8d40868158b0192b3392b309d97a;p=shipsimu.git

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index fc3d860..4d2926e 100644
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.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
  *
@@ -35,15 +35,6 @@ class Merchant extends BaseFrameworkSystem {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set description
-		$this->setObjectDescription("H&auml;ndler");
-
-		// Generate unique ID number
-		$this->generateUniqueId();
-
-		// Clean up a little
-		$this->removeSystemArray();
 	}
 
 	// Haendler mit Namen erzeugen
@@ -56,7 +47,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.",
+			$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,
@@ -105,54 +96,12 @@ class Merchant extends BaseFrameworkSystem {
 
 	// 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.",
-			__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();
 	}
 }