New interface SignableContract introduced, some comments translated

diff --git a/.gitattributes b/.gitattributes
index 33eb08eb7bc47e91d7e71697e432badf74b506a9..0a233de7701228153074650227d185b839763b14 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -50,6 +50,7 @@ application/ship-simu/interfaces/class_ContractPartner.php -text
 application/ship-simu/interfaces/class_Customer.php -text
 application/ship-simu/interfaces/class_ItemIsTradeable.php -text
 application/ship-simu/interfaces/class_Personellizer.php -text
 application/ship-simu/interfaces/class_Customer.php -text
 application/ship-simu/interfaces/class_ItemIsTradeable.php -text
 application/ship-simu/interfaces/class_Personellizer.php -text

+application/ship-simu/interfaces/class_SignableContract.php -text

 application/ship-simu/loader.php -text
 application/ship-simu/main/.htaccess -text
 application/ship-simu/main/class_ -text
 application/ship-simu/loader.php -text
 application/ship-simu/main/.htaccess -text
 application/ship-simu/main/class_ -text

diff --git a/application/ship-simu/interfaces/class_ContractPartner.php b/application/ship-simu/interfaces/class_ContractPartner.php
index 9b1bb8c279e8de2985566df17ee4c09e118d5d81..b398c4f52b9ddd46bf086a869ab0d5347a0cfa92 100644 (file)
--- a/application/ship-simu/interfaces/class_ContractPartner.php
+++ b/application/ship-simu/interfaces/class_ContractPartner.php
@@ -13,7 +13,7 @@ interface ContractPartner extends FrameworkInterface {
         * @return      boolean                 true  = can be a contract partner,
         *                                                      false = no partner for contracts
         */
         * @return      boolean                 true  = can be a contract partner,
         *                                                      false = no partner for contracts
         */

-       function isContractPartner (WorksContract $contractInstance);
+       function isContractPartner (SignableContract $contractInstance);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/application/ship-simu/interfaces/class_Customer.php b/application/ship-simu/interfaces/class_Customer.php
index a49150e410faf0214fe7a2d4be3bf32b6dbdb292..a111b1418ade940878d655572d7f6a396e6ec5a9 100644 (file)
--- a/application/ship-simu/interfaces/class_Customer.php
+++ b/application/ship-simu/interfaces/class_Customer.php
@@ -12,7 +12,7 @@ interface Customer extends FrameworkInterface {
         * @param               $contractInstance       A valid instance to WorksContract
         * @return      void
         */
         * @param               $contractInstance       A valid instance to WorksContract
         * @return      void
         */

-       function addNewWorksContract (WorksContract $contractInstance);
+       function addNewWorksContract (SignableContract $contractInstance);

 
        /**
         * Signs a works contract.
 
        /**
         * Signs a works contract.


@@ -31,7 +31,7 @@ interface Customer extends FrameworkInterface {
         *                                                                              set contract partner is
         *                                                                              not the expected
         */
         *                                                                              set contract partner is
         *                                                                              not the expected
         */

-       function signContract (WorksContract $contractInstance, ContractPartner $partnerInstance);
+       function signContract (SignableContract $contractInstance, ContractPartner $partnerInstance);

 
        /**
         * Withdraw from a signed contract
 
        /**
         * Withdraw from a signed contract


@@ -39,7 +39,7 @@ interface Customer extends FrameworkInterface {
         * @param               $contractInstance       A valid instance to WorksContract
         * @return      void
         */
         * @param               $contractInstance       A valid instance to WorksContract
         * @return      void
         */

-       function withdrawFromContract (WorksContract $contractInstance);
+       function withdrawFromContract (SignableContract $contractInstance);

 }
 
 // [EOF]
 }
 
 // [EOF]

diff --git a/application/ship-simu/interfaces/class_SignableContract.php b/application/ship-simu/interfaces/class_SignableContract.php
new file mode 100644 (file)
index 0000000..6b1636e
--- /dev/null
+++ b/application/ship-simu/interfaces/class_SignableContract.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * An interface for signable contracts
+ *
+ * @author     Roland Haeder <roland __NOSPAM__ [at] __REMOVE_ME__ mxchange [dot] org>
+ * @version    0.1
+ */
+interface SignableContract extends FrameworkInterface {
+       // Sign the contract
+       function signContract (ContractPartner $partnerInstance, ContractPartner $partyInstance);
+}
+
+// [EOF]
+?>
\ No newline at end of file

diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php
index 6f78c65071fb6a89128f17e545c5511f7b80e44c..09e3576a99b97590aa8d4278a6c0dcc19d2d394f 100644 (file)
--- a/application/ship-simu/main/class_BasePersonell.php
+++ b/application/ship-simu/main/class_BasePersonell.php
@@ -34,7 +34,7 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
                // Debug message
                if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
 
                // Debug message
                if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Personal");
        }
 
                $this->setPartDescr("Personal");
        }
 

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 1ef6dbd5608a23f18217b8f477567952534e1ea9..b45e8eeb5c8b11d790479475dd53a3bae3c70cc6 100644 (file)
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -13,7 +13,7 @@ class Merchant extends BaseFrameworkSystem {
 
        // Konstruktor
        private function __construct () {
 
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -24,10 +24,10 @@ class Merchant extends BaseFrameworkSystem {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Händler");
 
                $this->setPartDescr("Händler");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little


@@ -152,7 +152,7 @@ class Merchant extends BaseFrameworkSystem {
 
                // Iterate throw whole list
                for ($iter = $this->priceList->getIterator(); $iter->valid(); $iter->next()) {
 
                // 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...
                        $item = $iter->current();
 
                        // Does this item match? The unique ID may not work...

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index 961ef17b6567cd1c8a6455337aee97faccfabd32..c1e3dab65b97446c17156416c0ab1053805eadec 100644 (file)
--- a/application/ship-simu/main/class_WorksContract.php
+++ b/application/ship-simu/main/class_WorksContract.php
@@ -1,7 +1,7 @@
 <?php
 
 // Bauvertrag-Klasse
 <?php
 
 // Bauvertrag-Klasse

-class WorksContract extends BaseFrameworkSystem {
+class WorksContract extends BaseFrameworkSystem implements SignableContract {

        // Zukuenftiger Schiffsname
        private $shipName         = "";
 
        // Zukuenftiger Schiffsname
        private $shipName         = "";
 


@@ -22,7 +22,7 @@ class WorksContract extends BaseFrameworkSystem {
 
        // Konstruktor
        private function __construct () {
 
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -33,7 +33,7 @@ class WorksContract extends BaseFrameworkSystem {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Bauvertrag");
 
                // Unique-ID generieren
                $this->setPartDescr("Bauvertrag");
 
                // Unique-ID generieren


@@ -211,7 +211,7 @@ class WorksContract extends BaseFrameworkSystem {
                if ((defined('DEBUG_EVAL')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[Ship:] Konstruierte PHP-Anweisung: <pre><em>%s</em></pre><br />\n",
                        htmlentities($eval)
                ));
                if ((defined('DEBUG_EVAL')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[Ship:] Konstruierte PHP-Anweisung: <pre><em>%s</em></pre><br />\n",
                        htmlentities($eval)
                ));

-               
+

                // Code ausfuhren
                @eval($eval);
 
                // Code ausfuhren
                @eval($eval);
 

diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php
index 54b3e285cd0c246ae684e56506ced4b45d525592..bac3bbfecd0eab85144a2aa8590c7e51b7616ba2 100644 (file)
--- a/application/ship-simu/main/companies/class_ShippingCompany.php
+++ b/application/ship-simu/main/companies/class_ShippingCompany.php
@@ -28,7 +28,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
 
        // Konstruktor
        private function __construct () {
 
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -39,10 +39,10 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Reederei");
 
                $this->setPartDescr("Reederei");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little


@@ -52,7 +52,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        // Reederei gruenden (create wegen Namenskonvention)
        public static function createShippingCompany ($companyName, Harbor $hqInstance) {
                // Instanz holen
        // Reederei gruenden (create wegen Namenskonvention)
        public static function createShippingCompany ($companyName, Harbor $hqInstance) {
                // Instanz holen

-               $companyInstance = new ShippingCompany();               
+               $companyInstance = new ShippingCompany();

 
                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $companyInstance->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> wird gegr&uuml;ndet.<br />\n",
                        __CLASS__,
 
                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $companyInstance->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> wird gegr&uuml;ndet.<br />\n",
                        __CLASS__,


@@ -251,7 +251,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                        // Element holen
                                        $employee = $iterator->current();
                                } else {
                                        // Element holen
                                        $employee = $iterator->current();
                                } else {

-                                       // Should normally not happen... :(
+                                       // Should�normally not happen... :(

                                        throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
                                }
                        }
                                        throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
                                }
                        }


@@ -434,7 +434,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // Validate the requested ship type with the company if they can construct it
        }
 
        // Validate the requested ship type with the company if they can construct it

-       public function validateWorksContractShipType (WorksContract $contractInstance) {
+       public function validateWorksContractShipType (SignableContract $contractInstance) {

                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> pr&uuml;ft den Bauauftrag der <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> pr&uuml;ft den Bauauftrag der <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,


@@ -506,7 +506,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        // Validate if the first found shipyard can construct the requested type
                        $result = $shipyard->isShipTypeConstructable($shipType);
 
                        // Validate if the first found shipyard can construct the requested type
                        $result = $shipyard->isShipTypeConstructable($shipType);
 

-                       // Does this shipyard construct the requested ship type?
+                       //�Does this shipyard construct the requested ship type?

                        if ($result) break; // Then abort the search!
                }
 
                        if ($result) break; // Then abort the search!
                }
 


@@ -523,7 +523,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // As a customer the shipping company can add new contracts
        }
 
        // As a customer the shipping company can add new contracts

-       public function addNewWorksContract (WorksContract $contractInstance) {
+       public function addNewWorksContract (SignableContract $contractInstance) {

                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> erstellt einen Bauauftrag f&uuml;r ein <strong>%s</strong> mit dem Namen <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei <strong>%s</strong> erstellt einen Bauauftrag f&uuml;r ein <strong>%s</strong> mit dem Namen <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,


@@ -535,7 +535,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // As a customer the shippng company can withdraw from a contract
        }
 
        // As a customer the shippng company can withdraw from a contract

-       public function withdrawFromContract (WorksContract $contractInstance) {
+       public function withdrawFromContract (SignableContract $contractInstance) {

                ApplicationEntryPoint::app_die("WITHDRAW:<pre>".print_r($contractInstance, true)."</pre>");
        }
 
                ApplicationEntryPoint::app_die("WITHDRAW:<pre>".print_r($contractInstance, true)."</pre>");
        }
 


@@ -552,12 +552,13 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // Sign a contract with an other party which must also implement Customer
        }
 
        // Sign a contract with an other party which must also implement Customer

-       public function signContract (WorksContract $contractInstance, ContractPartner $partnerInstance) {
+       public function signContract (SignableContract $contractInstance, ContractPartner $partnerInstance) {
+               // Check wether the other party is our contract partner

                if (!$partnerInstance->isContractPartner($contractInstance)) {
                        // Invalid contract partner!
                        throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID);
                }
                if (!$partnerInstance->isContractPartner($contractInstance)) {
                        // Invalid contract partner!
                        throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID);
                }

-               
+

                // Determine if company "signs" own contract (must be done) or with an other party
                if ($this->equals($partnerInstance)) {
                        // With itself
                // Determine if company "signs" own contract (must be done) or with an other party
                if ($this->equals($partnerInstance)) {
                        // With itself


@@ -589,7 +590,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // Is this the right contract partner?
        }
 
        // Is this the right contract partner?

-       public function isContractPartner (WorksContract $contractInstance) {
+       public function isContractPartner (SignableContract $contractInstance) {

                // Get contract partner instance and compare it with $this contract partner
                return ($this->equals($contractInstance->getContractPartner()));
        }
                // Get contract partner instance and compare it with $this contract partner
                return ($this->equals($contractInstance->getContractPartner()));
        }

diff --git a/application/ship-simu/main/constructions/berths/class_Berth.php b/application/ship-simu/main/constructions/berths/class_Berth.php
index 06eac84de27aea3e23a10989ece5a0711a9ba600..e268397149f78c79655b6053c3f50a8beeef057f 100644 (file)
--- a/application/ship-simu/main/constructions/berths/class_Berth.php
+++ b/application/ship-simu/main/constructions/berths/class_Berth.php
@@ -16,13 +16,13 @@ class Berth extends BaseConstruction {
                        ));
                }
 
                        ));
                }
 

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                parent::constructor(__CLASS__);
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Liegeplatz");
 
                $this->setPartDescr("Liegeplatz");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
        }
 
                $this->createUniqueID();
        }
 

diff --git a/application/ship-simu/main/constructions/class_BaseConstruction.php b/application/ship-simu/main/constructions/class_BaseConstruction.php
index 16ef46894fdd1b528d54512feb39bd096a2bc78b..014d27853b91989848a845a65fbe04847fdf491b 100644 (file)
--- a/application/ship-simu/main/constructions/class_BaseConstruction.php
+++ b/application/ship-simu/main/constructions/class_BaseConstruction.php
@@ -14,7 +14,7 @@ class BaseConstruction extends BaseSimulator {
                        $this->__toString()
                ));
 
                        $this->__toString()
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Namenlose Landkonstruktion");
 
                // Etwas aufraeumen (brauchen wir hier nicht)
                $this->setPartDescr("Namenlose Landkonstruktion");
 
                // Etwas aufraeumen (brauchen wir hier nicht)

diff --git a/application/ship-simu/main/constructions/docks/class_DryDock.php b/application/ship-simu/main/constructions/docks/class_DryDock.php
index b0f19e663a8ed089d385ce52792ade183a8a833d..f90c2dac59fe647c75cae769180f859ecd43bc52 100644 (file)
--- a/application/ship-simu/main/constructions/docks/class_DryDock.php
+++ b/application/ship-simu/main/constructions/docks/class_DryDock.php
@@ -9,13 +9,13 @@ class DryDock extends BaseConstruction {
        private function __construct () {
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[DryDock:] Konstruktor erreicht.<br />\n");
 
        private function __construct () {
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[DryDock:] Konstruktor erreicht.<br />\n");
 

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                parent::constructor(__CLASS__);
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Trockendock");
 
                $this->setPartDescr("Trockendock");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
        }
 
                $this->createUniqueID();
        }
 

diff --git a/application/ship-simu/main/constructions/harbors/class_Harbor.php b/application/ship-simu/main/constructions/harbors/class_Harbor.php
index 1839754f909e5e51bf9477d5fed4e151a39a4747..2dd43ea568e817e1fa5c65f019775de5f7bfdf5e 100644 (file)
--- a/application/ship-simu/main/constructions/harbors/class_Harbor.php
+++ b/application/ship-simu/main/constructions/harbors/class_Harbor.php
@@ -5,7 +5,7 @@ class Harbor extends BaseConstruction {
        // Namen des Hafens (z.B. Hamburger Hafen)
        private $harborName = "Unbekannter Hafen";
 
        // Namen des Hafens (z.B. Hamburger Hafen)
        private $harborName = "Unbekannter Hafen";
 

-       // Schiffsliste aller gebauten Schiffe
+       //�Schiffsliste aller gebauten Schiffe

        private $constructedShips = null;
 
        // Liegeplatz-Liste
        private $constructedShips = null;
 
        // Liegeplatz-Liste


@@ -16,16 +16,16 @@ class Harbor extends BaseConstruction {
 
        // Constructor
        private function __construct () {
 
        // Constructor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_HARBOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[Harbor:] Konstruktor erreicht.<br />\n");
 
                parent::constructor(__CLASS__);
 
                // Debug message
                if (((defined('DEBUG_HARBOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[Harbor:] Konstruktor erreicht.<br />\n");
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Hafen");
 
                $this->setPartDescr("Hafen");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/constructions/terminals/class_Terminal.php b/application/ship-simu/main/constructions/terminals/class_Terminal.php
index ca61501979235fbdb65b5c26a365f47689fb6198..dbbed27417a1898e938c9d9b2250fd55461dce7d 100644 (file)
--- a/application/ship-simu/main/constructions/terminals/class_Terminal.php
+++ b/application/ship-simu/main/constructions/terminals/class_Terminal.php
@@ -14,13 +14,13 @@ class Terminal extends BaseConstruction {
                        ));
                }
 
                        ));
                }
 

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                parent::constructor(__CLASS__);
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Anlegebrücke");
 
                $this->setPartDescr("Anlegebrücke");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
        }
 
                $this->createUniqueID();
        }
 

diff --git a/application/ship-simu/main/constructions/yards/class_Shipyard.php b/application/ship-simu/main/constructions/yards/class_Shipyard.php
index 9d555dd18465c73aaad13892553e79b885129d1a..fa2dde0391f2ece5cc163ff6dde1da98f43d942e 100644 (file)
--- a/application/ship-simu/main/constructions/yards/class_Shipyard.php
+++ b/application/ship-simu/main/constructions/yards/class_Shipyard.php
@@ -25,7 +25,7 @@ class Shipyard extends BaseConstruction {
 
        // Constructor
        private function __construct () {
 
        // Constructor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -36,14 +36,14 @@ class Shipyard extends BaseConstruction {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Werft");
 
                // Staff-Liste/Schiffstyp-Liste erzeugen
                $this->createStaffList();
                $this->createShipTypeList();
 
                $this->setPartDescr("Werft");
 
                // Staff-Liste/Schiffstyp-Liste erzeugen
                $this->createStaffList();
                $this->createShipTypeList();
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
        }
 
                $this->createUniqueID();
        }
 

diff --git a/application/ship-simu/main/drives/class_BaseDrive.php b/application/ship-simu/main/drives/class_BaseDrive.php
index 7ebef58fbed124d11ac3d8af733608117ff2a000..bda42a41f6f2cb31bdd7c5b4b67a1db101fdcb8c 100644 (file)
--- a/application/ship-simu/main/drives/class_BaseDrive.php
+++ b/application/ship-simu/main/drives/class_BaseDrive.php
@@ -11,7 +11,7 @@ class BaseDrive extends BaseSimulator {
 
        // Konstruktor
        private function __construct ($class) {
 
        // Konstruktor
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message


@@ -22,7 +22,7 @@ class BaseDrive extends BaseSimulator {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Namenloser Antrieb");
 
                // Etwas aufraeumen
                $this->setPartDescr("Namenloser Antrieb");
 
                // Etwas aufraeumen

diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php
index 0af6b97a92e04c0092231657bb2e2f11a10a1e1b..645741be4c723f4bc791b4b76f980fd086d5940f 100644 (file)
--- a/application/ship-simu/main/drives/motor/class_Motor.php
+++ b/application/ship-simu/main/drives/motor/class_Motor.php
@@ -4,7 +4,7 @@
 class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart {
        // Constructor
        private function __construct() {
 class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart {
        // Constructor
        private function __construct() {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -15,10 +15,10 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Namenloser Motor");
 
                $this->setPartDescr("Namenloser Motor");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/parts/class_BaseShipPart.php b/application/ship-simu/main/parts/class_BaseShipPart.php
index 4ce775f04c6b4c7889015dfed01e98a6d03b1393..becf6c829331aa8e8b81401e4676b17d410b6ca7 100644 (file)
--- a/application/ship-simu/main/parts/class_BaseShipPart.php
+++ b/application/ship-simu/main/parts/class_BaseShipPart.php
@@ -7,7 +7,7 @@ class BaseShipPart extends BaseSimulator {
 
        // Konstruktor
        private function __construct($class) {
 
        // Konstruktor
        private function __construct($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message

diff --git a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
index 0e3f472f033054a5e421eb58c81cb4fc2412a3b5..478ace61d92c16ffabdfb168df2bfe4664b441a8 100644 (file)
--- a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
+++ b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
@@ -4,7 +4,7 @@
 class MaschineRoom extends BaseShipPart {
        // Constructor
        private function __construct () {
 class MaschineRoom extends BaseShipPart {
        // Constructor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -15,10 +15,10 @@ class MaschineRoom extends BaseShipPart {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Maschinenraum");
 
                $this->setPartDescr("Maschinenraum");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php
index 8581536f87e68abfc9998c9274534f54dceb8215..b46bb03dd01642a2e97ebd3d56b46a63796cd157 100644 (file)
--- a/application/ship-simu/main/personell/class_SimulatorPersonell.php
+++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php
@@ -17,7 +17,7 @@ class SimulatorPersonell extends BasePersonell {
         * @return      void
         */
        private function __construct () {
         * @return      void
         */
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                if (((defined('DEBUG_PERSONELL')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",
                parent::constructor(__CLASS__);
 
                if (((defined('DEBUG_PERSONELL')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",

diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
index 1ea8ab2d916a962e628d439dc595e1c7163a4ac9..d996f9f7536a78a004a61e195ca82f313c86768a 100644 (file)
--- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php
+++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
@@ -18,7 +18,7 @@ class CompanyEmployee extends SimulatorPersonell {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Firmenangestellte(r)");
 
                // Create unique ID
                $this->setPartDescr("Firmenangestellte(r)");
 
                // Create unique ID

diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php
index 65e4da0fa6824ab13c3782ccbb20fc0161ca10f1..d7c394b1e7930bdc164dd551c3017f46ae199648 100644 (file)
--- a/application/ship-simu/main/ships/class_BaseShip.php
+++ b/application/ship-simu/main/ships/class_BaseShip.php
@@ -17,7 +17,7 @@ class BaseShip extends BaseSimulator {
 
        // Namenloses Ship generieren
        private function __construct($class) {
 
        // Namenloses Ship generieren
        private function __construct($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Beim Schiff angelangt
                parent::constructor($class);
 
                // Beim Schiff angelangt

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index de7805078b83ff95e34dc32f90540857b457d085..9c53ed96abc036abd286fb9a117a1b713a8aaaf3 100644 (file)
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -14,10 +14,10 @@ class PassengerShip extends BaseShip implements ConstructableShip {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Passagier-Schiff");
 
                $this->setPartDescr("Passagier-Schiff");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/class_BaseStructure.php b/application/ship-simu/main/structures/class_BaseStructure.php
index 3e8d3f0cc32874a57838fd9a89d376af4bdc8229..83c1d63ba916037074d4e36b5c7cc3095d10d0af 100644 (file)
--- a/application/ship-simu/main/structures/class_BaseStructure.php
+++ b/application/ship-simu/main/structures/class_BaseStructure.php
@@ -6,7 +6,7 @@ class BaseStructure extends BaseSimulator {
 
        // Konstruktor (hier keine Exceptions aendern!)
        private function __construct ($class) {
 
        // Konstruktor (hier keine Exceptions aendern!)
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message


@@ -17,7 +17,7 @@ class BaseStructure extends BaseSimulator {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Schiffsstrukturen");
 
                // Etwas aufraeumen
                $this->setPartDescr("Schiffsstrukturen");
 
                // Etwas aufraeumen

diff --git a/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php b/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php
index a70be56de7a16c28ecb47ed67cac5122d1aae134..2500226300c668d522471f3909d271dff3f6347e 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php
@@ -3,10 +3,10 @@
 class BaseCabin extends BaseCabinStructure {
        // Konstruktor
        private function __construct ($class) {
 class BaseCabin extends BaseCabinStructure {
        // Konstruktor
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                parent::constructor($class);
 

-               // Debug message
+               //�Debug message

                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
                        $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
                                __CLASS__,
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
                        $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
                                __CLASS__,


@@ -14,7 +14,7 @@ class BaseCabin extends BaseCabinStructure {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Kabine");
 
                // Maybe clean up a little
                $this->setPartDescr("Kabine");
 
                // Maybe clean up a little


@@ -39,7 +39,7 @@ class BaseCabin extends BaseCabinStructure {
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $cabinInstance->createUniqueID();
 
                // Instanz zurueckgeben
                $cabinInstance->createUniqueID();
 
                // Instanz zurueckgeben

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
index bc1bde229e938cbe9415c6015444f5f6d832e65e..47616dfc68be8b9c123bdca0abeb826974bc0e98 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
@@ -3,7 +3,7 @@
 class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -14,10 +14,10 @@ class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Economy-Class-Kabine");
 
                $this->setPartDescr("Economy-Class-Kabine");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php
index 4c6d263e4bd615cc22127fae90a22f46886e86ac..de8393ad6c628fdb3802de44ae8b38b895d2ab85 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php
@@ -3,7 +3,7 @@
 class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPa
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("2Star-Class-Kabine");
 
                $this->setPartDescr("2Star-Class-Kabine");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
index bc36d6e3f4465b5ab7c4a6411ee0392a1813882f..c7a6af07fa733ca2b3cb090ae0bbacecad469f1f 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
@@ -3,7 +3,7 @@
 class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               //�Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShi
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Luxuskabine");
 
                $this->setPartDescr("Luxuskabine");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
index 99b41b2e9989f0be4c7691da59a89a6fc13717c8..31f9e6bfe8ad276bd9834b8a56f1fcff2fd29129 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
@@ -3,7 +3,7 @@
 class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Premier-Class-Kabine");
 
                $this->setPartDescr("Premier-Class-Kabine");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
index 7d7d7fb8a817b785ff508319eadf14fcb4e6ba8d..b26f692fd94ef233037558c083be42e6aa412842 100644 (file)
--- a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
+++ b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php
@@ -13,7 +13,7 @@ class BaseCabinStructure extends BaseStructure {
 
        // Konstruktor
        private function __construct ($class) {
 
        // Konstruktor
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message


@@ -24,7 +24,7 @@ class BaseCabinStructure extends BaseStructure {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Kabinenstruktur");
        }
 
                $this->setPartDescr("Kabinenstruktur");
        }
 

diff --git a/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php b/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php
index 1b225caa08b770f7da99bd735f4375a8eb202d84..7aee583a6e06eaf41aa60f2572f18fc581e86a4f 100644 (file)
--- a/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php
+++ b/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php
@@ -6,7 +6,7 @@ class BaseDeckStructure extends BaseStructure {
 
        // Konstruktor
        private function __construct ($class) {
 
        // Konstruktor
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message


@@ -17,7 +17,7 @@ class BaseDeckStructure extends BaseStructure {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Deckstruktur");
        }
 
                $this->setPartDescr("Deckstruktur");
        }
 

diff --git a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
index 06bdf308ce6d55c09e3e3aed1bd28ba8b1f07b02..e4488cdd689f700e12dd87d1865aa20b6393209c 100644 (file)
--- a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
+++ b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php
@@ -5,7 +5,7 @@ class BaseUpperStructure extends BaseStructure {
         * Constructor for all super structures on a ship
         */
        private function __construct ($class) {
         * Constructor for all super structures on a ship
         */
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debug message
                parent::constructor($class);
 
                // Debug message


@@ -16,7 +16,7 @@ class BaseUpperStructure extends BaseStructure {
                        ));
                }
 
                        ));
                }
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Aufbauten");
 
                // Shall we clean up?
                $this->setPartDescr("Aufbauten");
 
                // Shall we clean up?

diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php
index b95faf6b93a827a93a624986e6cc4f62837cd850..e13619883d0c4a195b553cae05169a8c72e51a8d 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php
@@ -3,7 +3,7 @@
 class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Autodeck");
 
                $this->setPartDescr("Autodeck");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php
index 840c1aaa95f2bfc80365e1251cacb09a9b254522..85355116edc53e73926ae3022f13f4cb673c5c15 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php
@@ -3,7 +3,7 @@
 class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Zug-Deck");
 
                $this->setPartDescr("Zug-Deck");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php b/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php
index ecccce258a3b0252433a0f8569b7ce7977faf12d..81d5d33d1d47984d78068a75ae5d427e4d53fb16 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php
@@ -3,7 +3,7 @@
 class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {
 class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart {
        // Konstruktor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("LKW-Deck");
 
                $this->setPartDescr("LKW-Deck");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little

diff --git a/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php b/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php
index ba1a32f757ea6e3b1d2ff44031b8e13b19e87af8..30b6978dfa4e10304931c6b9e5219da918bef0f5 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php
@@ -5,7 +5,7 @@ class BaseDeck extends BaseDeckStructure {
        * Constructor for cargo decks in general
        */
        private function __construct ($class) {
        * Constructor for cargo decks in general
        */
        private function __construct ($class) {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor($class);
 
                // Debub message
                parent::constructor($class);
 
                // Debub message


@@ -14,7 +14,7 @@ class BaseDeck extends BaseDeckStructure {
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Deck");
 
                // Maybe clean up?
                $this->setPartDescr("Deck");
 
                // Maybe clean up?

diff --git a/application/ship-simu/main/structures/extended/upper/class_Bridge.php b/application/ship-simu/main/structures/extended/upper/class_Bridge.php
index 08ea8e7519cf87ab7520d89e995d49972bf3605d..9aefdcd6426d6d76c1064f89b7027fdfe4a4f3a6 100644 (file)
--- a/application/ship-simu/main/structures/extended/upper/class_Bridge.php
+++ b/application/ship-simu/main/structures/extended/upper/class_Bridge.php
@@ -3,7 +3,7 @@
 class Bridge extends BaseUpperStructure implements ItemIsTradeable, ConstructableShipPart {
        // Constructor
        private function __construct () {
 class Bridge extends BaseUpperStructure implements ItemIsTradeable, ConstructableShipPart {
        // Constructor
        private function __construct () {

-               // Eltern-Konstruktor aufrufen
+               // Call parent constructor

                parent::constructor(__CLASS__);
 
                // Debug message
                parent::constructor(__CLASS__);
 
                // Debug message


@@ -12,10 +12,10 @@ class Bridge extends BaseUpperStructure implements ItemIsTradeable, Constructabl
                        __LINE__
                ));
 
                        __LINE__
                ));
 

-               // Beschreibung setzen
+               // Set description

                $this->setPartDescr("Brücke");
 
                $this->setPartDescr("Brücke");
 

-               // Unique-ID erzeugen
+               // Generate unique ID number

                $this->createUniqueID();
 
                // Clean up a little
                $this->createUniqueID();
 
                // Clean up a little


@@ -39,7 +39,7 @@ class Bridge extends BaseUpperStructure implements ItemIsTradeable, Constructabl
                $bridgeInstance->setHeight($height);
                $bridgeInstance->setLength($length);
 
                $bridgeInstance->setHeight($height);
                $bridgeInstance->setLength($length);
 

-               // Instanz zurueckgeben
+               //�Instanz zurueckgeben

                return $bridgeInstance;
        }
 
                return $bridgeInstance;
        }