From edc57038a9262e3a04572e0d9036a9f745b10fb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 8 Mar 2008 12:13:13 +0000 Subject: [PATCH] New interface SignableContract introduced, some comments translated --- .gitattributes | 1 + .../interfaces/class_ContractPartner.php | 2 +- .../ship-simu/interfaces/class_Customer.php | 6 ++--- .../interfaces/class_SignableContract.php | 14 +++++++++++ .../ship-simu/main/class_BasePersonell.php | 2 +- application/ship-simu/main/class_Merchant.php | 8 +++--- .../ship-simu/main/class_WorksContract.php | 8 +++--- .../main/companies/class_ShippingCompany.php | 25 ++++++++++--------- .../main/constructions/berths/class_Berth.php | 6 ++--- .../constructions/class_BaseConstruction.php | 2 +- .../constructions/docks/class_DryDock.php | 6 ++--- .../constructions/harbors/class_Harbor.php | 8 +++--- .../terminals/class_Terminal.php | 6 ++--- .../constructions/yards/class_Shipyard.php | 6 ++--- .../ship-simu/main/drives/class_BaseDrive.php | 4 +-- .../main/drives/motor/class_Motor.php | 6 ++--- .../main/parts/class_BaseShipPart.php | 2 +- .../parts/maschineroom/class_MaschineRoom.php | 6 ++--- .../personell/class_SimulatorPersonell.php | 2 +- .../company/class_CompanyEmployee.php | 2 +- .../ship-simu/main/ships/class_BaseShip.php | 2 +- .../ships/passenger/class_PassengerShip.php | 4 +-- .../main/structures/class_BaseStructure.php | 4 +-- .../extended/cabines/class_BaseCabin.php | 8 +++--- .../cabines/ship/class_EconomyCabin.php | 6 ++--- .../extended/cabines/ship/class_LowCabin.php | 6 ++--- .../cabines/ship/class_LuxuryCabin.php | 6 ++--- .../cabines/ship/class_PremierCabin.php | 6 ++--- .../extended/class_BaseCabinStructure.php | 4 +-- .../extended/class_BaseDeckStructure.php | 4 +-- .../extended/class_BaseUpperStructure.php | 4 +-- .../extended/decks/cargo/class_CarDeck.php | 6 ++--- .../extended/decks/cargo/class_TrainDeck.php | 6 ++--- .../extended/decks/cargo/class_TruckDeck.php | 6 ++--- .../extended/decks/class_BaseDeck.php | 4 +-- .../extended/upper/class_Bridge.php | 8 +++--- 36 files changed, 111 insertions(+), 95 deletions(-) create mode 100644 application/ship-simu/interfaces/class_SignableContract.php diff --git a/.gitattributes b/.gitattributes index 33eb08e..0a233de 100644 --- 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_SignableContract.php -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 9b1bb8c..b398c4f 100644 --- 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 */ - function isContractPartner (WorksContract $contractInstance); + function isContractPartner (SignableContract $contractInstance); } // [EOF] diff --git a/application/ship-simu/interfaces/class_Customer.php b/application/ship-simu/interfaces/class_Customer.php index a49150e..a111b14 100644 --- 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 */ - function addNewWorksContract (WorksContract $contractInstance); + function addNewWorksContract (SignableContract $contractInstance); /** * Signs a works contract. @@ -31,7 +31,7 @@ interface Customer extends FrameworkInterface { * set contract partner is * not the expected */ - function signContract (WorksContract $contractInstance, ContractPartner $partnerInstance); + function signContract (SignableContract $contractInstance, ContractPartner $partnerInstance); /** * Withdraw from a signed contract @@ -39,7 +39,7 @@ interface Customer extends FrameworkInterface { * @param $contractInstance A valid instance to WorksContract * @return void */ - function withdrawFromContract (WorksContract $contractInstance); + function withdrawFromContract (SignableContract $contractInstance); } // [EOF] diff --git a/application/ship-simu/interfaces/class_SignableContract.php b/application/ship-simu/interfaces/class_SignableContract.php new file mode 100644 index 0000000..6b1636e --- /dev/null +++ b/application/ship-simu/interfaces/class_SignableContract.php @@ -0,0 +1,14 @@ + + * @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 6f78c65..09e3576 100644 --- 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.
\n"); - // Beschreibung setzen + // Set description $this->setPartDescr("Personal"); } diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php index 1ef6dbd..b45e8ee 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -24,10 +24,10 @@ class Merchant extends BaseFrameworkSystem { )); } - // Beschreibung setzen + // Set description $this->setPartDescr("Händler"); - // Unique-ID erzeugen + // Generate unique ID number $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()) { - // Get current item + //�Get current item $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 961ef17..c1e3dab 100644 --- a/application/ship-simu/main/class_WorksContract.php +++ b/application/ship-simu/main/class_WorksContract.php @@ -1,7 +1,7 @@ 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: 
%s

\n", htmlentities($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 54b3e28..bac3bbf 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -39,10 +39,10 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner )); } - // Beschreibung setzen + // Set description $this->setPartDescr("Reederei"); - // Unique-ID erzeugen + // Generate unique ID number $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 - $companyInstance = new ShippingCompany(); + $companyInstance = new ShippingCompany(); if ((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) $companyInstance->getDebugInstance()->output(sprintf("[%s:%d] Die Reederei %s wird gegründet.
\n", __CLASS__, @@ -251,7 +251,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Element holen $employee = $iterator->current(); } else { - // Should normally not happen... :( + // Should�normally not happen... :( 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 - 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 %s prüft den Bauauftrag der %s.
\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); - // Does this shipyard construct the requested ship type? + //�Does this shipyard construct the requested ship type? 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 - 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 %s erstellt einen Bauauftrag für ein %s mit dem Namen %s.
\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 - public function withdrawFromContract (WorksContract $contractInstance) { + public function withdrawFromContract (SignableContract $contractInstance) { ApplicationEntryPoint::app_die("WITHDRAW:
".print_r($contractInstance, true)."
"); } @@ -552,12 +552,13 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner } // 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); } - + // 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? - 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())); } diff --git a/application/ship-simu/main/constructions/berths/class_Berth.php b/application/ship-simu/main/constructions/berths/class_Berth.php index 06eac84..e268397 100644 --- 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__); - // Beschreibung setzen + // Set description $this->setPartDescr("Liegeplatz"); - // Unique-ID erzeugen + // Generate unique ID number $this->createUniqueID(); } diff --git a/application/ship-simu/main/constructions/class_BaseConstruction.php b/application/ship-simu/main/constructions/class_BaseConstruction.php index 16ef468..014d278 100644 --- 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() )); - // Beschreibung setzen + // Set description $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 b0f19e6..f90c2da 100644 --- 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.
\n"); - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); - // Beschreibung setzen + // Set description $this->setPartDescr("Trockendock"); - // Unique-ID erzeugen + // Generate unique ID number $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 1839754..2dd43ea 100644 --- 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"; - // Schiffsliste aller gebauten Schiffe + //�Schiffsliste aller gebauten Schiffe private $constructedShips = null; // Liegeplatz-Liste @@ -16,16 +16,16 @@ class Harbor extends BaseConstruction { // 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.
\n"); - // Beschreibung setzen + // Set description $this->setPartDescr("Hafen"); - // Unique-ID erzeugen + // Generate unique ID number $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 ca61501..dbbed27 100644 --- 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__); - // Beschreibung setzen + // Set description $this->setPartDescr("Anlegebrücke"); - // Unique-ID erzeugen + // Generate unique ID number $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 9d555dd..fa2dde0 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor 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(); - // Unique-ID erzeugen + // Generate unique ID number $this->createUniqueID(); } diff --git a/application/ship-simu/main/drives/class_BaseDrive.php b/application/ship-simu/main/drives/class_BaseDrive.php index 7ebef58..bda42a4 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debug message @@ -22,7 +22,7 @@ class BaseDrive extends BaseSimulator { )); } - // Beschreibung setzen + // Set description $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 0af6b97..645741b 100644 --- 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() { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -15,10 +15,10 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart )); } - // Beschreibung setzen + // Set description $this->setPartDescr("Namenloser Motor"); - // Unique-ID erzeugen + // Generate unique ID number $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 4ce775f..becf6c8 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor 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 0e3f472..478ace6 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -15,10 +15,10 @@ class MaschineRoom extends BaseShipPart { )); } - // Beschreibung setzen + // Set description $this->setPartDescr("Maschinenraum"); - // Unique-ID erzeugen + // Generate unique ID number $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 8581536..b46bb03 100644 --- 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 () { - // 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.
\n", diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php index 1ea8ab2..d996f9f 100644 --- 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 diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php index 65e4da0..d7c394b 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor 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 de78050..9c53ed9 100644 --- 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"); - // Unique-ID erzeugen + // Generate unique ID number $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 3e8d3f0..83c1d63 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debug message @@ -17,7 +17,7 @@ class BaseStructure extends BaseSimulator { )); } - // Beschreibung setzen + // Set description $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 a70be56..2500226 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor 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.
\n", __CLASS__, @@ -14,7 +14,7 @@ class BaseCabin extends BaseCabinStructure { )); } - // Beschreibung setzen + // Set description $this->setPartDescr("Kabine"); // Maybe clean up a little @@ -39,7 +39,7 @@ class BaseCabin extends BaseCabinStructure { __LINE__ )); - // Unique-ID erzeugen + // Generate unique ID number $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 bc1bde2..47616df 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor 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"); - // Unique-ID erzeugen + // Generate unique ID number $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 4c6d263..de8393a 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPa __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("2Star-Class-Kabine"); - // Unique-ID erzeugen + // Generate unique ID number $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 bc36d6e..c7a6af0 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + //�Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShi __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("Luxuskabine"); - // Unique-ID erzeugen + // Generate unique ID number $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 99b41b2..31f9e6b 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("Premier-Class-Kabine"); - // Unique-ID erzeugen + // Generate unique ID number $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 7d7d7fb..b26f692 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debug message @@ -24,7 +24,7 @@ class BaseCabinStructure extends BaseStructure { )); } - // Beschreibung setzen + // Set description $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 1b225ca..7aee583 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debug message @@ -17,7 +17,7 @@ class BaseDeckStructure extends BaseStructure { )); } - // Beschreibung setzen + // Set description $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 06bdf30..e4488cd 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debug message @@ -16,7 +16,7 @@ class BaseUpperStructure extends BaseStructure { )); } - // Beschreibung setzen + // Set description $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 b95faf6..e136198 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("Autodeck"); - // Unique-ID erzeugen + // Generate unique ID number $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 840c1aa..8535511 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("Zug-Deck"); - // Unique-ID erzeugen + // Generate unique ID number $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 ecccce2..81d5d33 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("LKW-Deck"); - // Unique-ID erzeugen + // Generate unique ID number $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 ba1a32f..30b6978 100644 --- 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) { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor($class); // Debub message @@ -14,7 +14,7 @@ class BaseDeck extends BaseDeckStructure { __LINE__ )); - // Beschreibung setzen + // Set description $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 08ea8e7..9aefdcd 100644 --- 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 () { - // Eltern-Konstruktor aufrufen + // Call parent constructor parent::constructor(__CLASS__); // Debug message @@ -12,10 +12,10 @@ class Bridge extends BaseUpperStructure implements ItemIsTradeable, Constructabl __LINE__ )); - // Beschreibung setzen + // Set description $this->setPartDescr("Brücke"); - // Unique-ID erzeugen + // Generate unique ID number $this->createUniqueID(); // Clean up a little @@ -39,7 +39,7 @@ class Bridge extends BaseUpperStructure implements ItemIsTradeable, Constructabl $bridgeInstance->setHeight($height); $bridgeInstance->setLength($length); - // Instanz zurueckgeben + //�Instanz zurueckgeben return $bridgeInstance; } -- 2.39.5