Method constructor() removed, several small fixes

[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 c40f23678dd6ab69c9270b98a19bdfc34bf001df..ce657135918dda52f1bcd184d39daae0c801c6c5 100644 (file)
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -19,7 +19,7 @@
  * 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/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class Merchant extends BaseFrameworkSystem {
        // Name des Haendlers
@@ -32,9 +32,9 @@ class Merchant extends BaseFrameworkSystem {
        private $harborInstance = null;
 
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -45,7 +45,7 @@ class Merchant extends BaseFrameworkSystem {
                }
 
                // Set description
-               $this->setPartDescr("H&auml;ndler");
+               $this->setObjectDescription("H&auml;ndler");
 
                // Generate unique ID number
                $this->createUniqueID();
@@ -152,7 +152,7 @@ class Merchant extends BaseFrameworkSystem {
                        __LINE__,
                        $this->getMerchantName(),
                        $itemInstance->__toString(),
-                       $itemInstance->getPartDescr(),
+                       $itemInstance->getObjectDescription(),
                        $this->formatCurrency($price)
                ));