Method constructor() removed, several small fixes

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

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index aaa597fdb1ee6ac3cc67a4fa18cd0f0fa192b782..96f1bcaf0b2087b7694a5631c15ce5b455648fc6 100644 (file)
--- a/application/ship-simu/main/class_WorksContract.php
+++ b/application/ship-simu/main/class_WorksContract.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 WorksContract extends BaseFrameworkSystem implements SignableContract {
        // Zukuenftiger Schiffsname
@@ -41,9 +41,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
        private $merchantInstance = null;
 
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
@@ -54,7 +54,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                }
 
                // Set description
-               $this->setPartDescr("Bauvertrag");
+               $this->setObjectDescription("Bauvertrag");
 
                // Unique-ID generieren
                $this->createUniqueID();
@@ -89,7 +89,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                        __CLASS__,
                        __LINE__,
                        $shipName,
-                       $partnerInstance->getPartDescr(),
+                       $partnerInstance->getObjectDescription(),
                        $partnerInstance->getCompanyName()
                ));
 
@@ -262,7 +262,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> kostet <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $instance->getPartDescr(),
+                       $instance->getObjectDescription(),
                        $this->getMerchantInstance()->formatCurrency($price)
                ));
 
@@ -273,7 +273,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> wurde in den Bauvertrag aufgenommen.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $instance->getPartDescr()
+                       $instance->getObjectDescription()
                ));
        }
 
@@ -334,9 +334,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> stimmt einem Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> zu.<br />\n",
                                        __CLASS__,
                                        __LINE__,
-                                       $partnerInstance->getPartDescr(),
+                                       $partnerInstance->getObjectDescription(),
                                        $partnerInstance->getCompanyName(),
-                                       $this->getShipInstance()->getPartDescr(),
+                                       $this->getShipInstance()->getObjectDescription(),
                                        $this->getShipInstance()->getShipName()
                                ));
                        } else {
@@ -344,11 +344,11 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> geht mit der <strong>%s</strong> <em><strong>%s</strong></em> einen Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> ein.<br />\n",
                                        __CLASS__,
                                        __LINE__,
-                                       $partnerInstance->getPartDescr(),
+                                       $partnerInstance->getObjectDescription(),
                                        $partnerInstance->getCompanyName(),
-                                       $partyInstance->getPartDescr(),
+                                       $partyInstance->getObjectDescription(),
                                        $partyInstance->getCompanyName(),
-                                       $this->getShipInstance()->getPartDescr(),
+                                       $this->getShipInstance()->getObjectDescription(),
                                        $this->getShipInstance()->getShipName()
                                ));
                        }