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

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 3f13a63..e993c2d 100644
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -1,6 +1,26 @@
 <?php
-
-// Die Haendler-Klasse
+/**
+ * A class for merchants which can trade items
+ *
+ * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @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
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
 class Merchant extends BaseFrameworkSystem {
 	// Name des Haendlers
 	private $merchantName   = "Namenloser H&auml;ndler";
@@ -12,30 +32,22 @@ 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();
 	}
 
 	// Haendler mit Namen erzeugen
-	public static function createMerchant ($merchantName, Harbor $harborInstance) {
+	public final static function createMerchant ($merchantName, Harbor $harborInstance) {
 		// String absichern
 		$merchantName = (string) $merchantName;
 
@@ -72,7 +84,7 @@ class Merchant extends BaseFrameworkSystem {
 			__LINE__,
 			$this->getMerchantName()
 		));
-		$this->priceList = new FrameworkArrayObject();
+		$this->priceList = new FrameworkArrayObject("FakedPriceList");
 	}
 
 	// Setter for merchant name
@@ -122,7 +134,7 @@ class Merchant extends BaseFrameworkSystem {
 	}
 
 	// Add new item to merchant's price list
-	public function addItemToPriceList (ItemIsTradeable $itemInstance, $price) {
+	public function addItemToPriceList (TradeableItem $itemInstance, $price) {
 		// Secure pricing
 		$price = (float) $price;
 
@@ -132,7 +144,7 @@ class Merchant extends BaseFrameworkSystem {
 			__LINE__,
 			$this->getMerchantName(),
 			$itemInstance->__toString(),
-			$itemInstance->getPartDescr(),
+			$itemInstance->getObjectDescription(),
 			$this->formatCurrency($price)
 		));
 
@@ -147,12 +159,12 @@ class Merchant extends BaseFrameworkSystem {
 	}
 
 	// Get a price from the merchant's list
-	public final function getPriceFromList (ItemIsTradeable $itemInstance) {
+	public final function getPriceFromList (TradeableItem $itemInstance) {
 		$price = 0;
 
 		// Iterate throw whole list
 		for ($iter = $this->priceList->getIterator(); $iter->valid(); $iter->next()) {
-			//�Get current item
+			// Get current item
 			$item = $iter->current();
 
 			// Does this item match? The unique ID may not work...
@@ -172,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]