More renamed

[shipsimu.git] / application / ship-simu / main / class_Merchant.php

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index b0748e7fc890f15118506f73624758fb12523b4f..648e299c86d18c507b5d715e3199203feaf9a13a 100644 (file)
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -2,11 +2,11 @@
 /**
  * A class for merchants which can trade items
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.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.shipsimu.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
@@ -35,13 +35,10 @@ class Merchant extends BaseFrameworkSystem {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeSystemArray();
        }
 
        // Haendler mit Namen erzeugen
-       public final static function createMerchant ($merchantName, Harbor $harborInstance) {
+       public static final function createMerchant ($merchantName, Harbor $harborInstance) {
                // String absichern
                $merchantName = (string) $merchantName;
 
@@ -99,44 +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;
-
-               // 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();
        }
 }