'final' added to factory methods

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index c47ef8785503dd929dd57656beee7c71a22f5f4a..b0866dcb8e97d37b00fa69def9d9ce0eaa822e0a 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -80,7 +80,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
         * @param               $fileIOInstance The file I/O instance
         * @return              $selInstance            An instance of ApplicationSelector
         */
         * @param               $fileIOInstance The file I/O instance
         * @return              $selInstance            An instance of ApplicationSelector
         */

-       public static function createApplicationSelector (ManageableLanguage $langInstance, FileIOHandler $fileIOInstance) {
+       public final static function createApplicationSelector (ManageableLanguage $langInstance, FileIOHandler $fileIOInstance) {

                // Get a new instance
                $selInstance = new ApplicationSelector();
 
                // Get a new instance
                $selInstance = new ApplicationSelector();
 

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index 40d2207bf4254604b1dc3bfd1c1b02db1ce352f9..3a2b892bd816576e1de3fc48215a9a2007493efc 100644 (file)
--- a/application/ship-simu/main/class_Merchant.php
+++ b/application/ship-simu/main/class_Merchant.php
@@ -55,7 +55,7 @@ class Merchant extends BaseFrameworkSystem {
        }
 
        // Haendler mit Namen erzeugen
        }
 
        // Haendler mit Namen erzeugen

-       public static function createMerchant ($merchantName, Harbor $harborInstance) {
+       public final static function createMerchant ($merchantName, Harbor $harborInstance) {

                // String absichern
                $merchantName = (string) $merchantName;
 
                // String absichern
                $merchantName = (string) $merchantName;
 

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index 0504fa59a5d470c94f3e63cef8adbc742ca63c5b..1613d7432efc1761844e3f43943e195b67c77756 100644 (file)
--- a/application/ship-simu/main/class_WorksContract.php
+++ b/application/ship-simu/main/class_WorksContract.php
@@ -64,7 +64,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
        }
 
        // Neuen Bauvertrag generieren
        }
 
        // Neuen Bauvertrag generieren

-       public static function createWorksContract ($shipType, $shipName, ContractPartner $partnerInstance) {
+       public final static function createWorksContract ($shipType, $shipName, ContractPartner $partnerInstance) {

                // Strings absichern
                $shipType = (string) $shipType;
                $shipName = (string) $shipName;
                // Strings absichern
                $shipType = (string) $shipType;
                $shipName = (string) $shipName;

diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php
index 8bb077cbe5e6efaec33982c6fdeb6c96159d7b35..18c0e747a69156965e76c284b398d574be9a514f 100644 (file)
--- a/application/ship-simu/main/companies/class_ShippingCompany.php
+++ b/application/ship-simu/main/companies/class_ShippingCompany.php
@@ -90,7 +90,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
        }
 
        // Reederei gruenden (create wegen Namenskonvention)
        }
 
        // Reederei gruenden (create wegen Namenskonvention)

-       public static function createShippingCompany ($companyName, Harbor $hqInstance) {
+       public final static function createShippingCompany ($companyName, Harbor $hqInstance) {

                // Get new instance
                $companyInstance = new ShippingCompany();
 
                // Get new instance
                $companyInstance = new ShippingCompany();
 

diff --git a/application/ship-simu/main/constructions/harbors/class_Harbor.php b/application/ship-simu/main/constructions/harbors/class_Harbor.php
index ce273ad58f3143f9ebfc2e4b5f3ad708130d6f10..7c1ce55c1f8e0aa2a3630be356f9e22887798df4 100644 (file)
--- a/application/ship-simu/main/constructions/harbors/class_Harbor.php
+++ b/application/ship-simu/main/constructions/harbors/class_Harbor.php
@@ -54,7 +54,7 @@ class Harbor extends BaseConstruction {
        }
 
        // Creates a harbor
        }
 
        // Creates a harbor

-       public static function createHarbor ($harborName) {
+       public final static function createHarbor ($harborName) {

                // Hafen-Instanz holen
                $harborInstance = new Harbor();
 
                // Hafen-Instanz holen
                $harborInstance = new Harbor();
 

diff --git a/application/ship-simu/main/constructions/yards/class_Shipyard.php b/application/ship-simu/main/constructions/yards/class_Shipyard.php
index 050f0d71bdf6a3ca9b1b86ba0413333ef7a373ec..18a018e4ed53b6a1a6ce8be8a942fcfb57e872a0 100644 (file)
--- a/application/ship-simu/main/constructions/yards/class_Shipyard.php
+++ b/application/ship-simu/main/constructions/yards/class_Shipyard.php
@@ -69,7 +69,7 @@ class Shipyard extends BaseConstruction {
        }
 
        // Create a shipyard and notify it about it's owner
        }
 
        // Create a shipyard and notify it about it's owner

-       public static function createShipyardNotify (Harbor $harborInstance, $shipyardName, ShippingCompany $companyInstance) {
+       public final static function createShipyardNotify (Harbor $harborInstance, $shipyardName, ShippingCompany $companyInstance) {

                // Werft-Instanz holen
                $shipyardInstance = self::createShipyard($harborInstance, $shipyardName);
 
                // Werft-Instanz holen
                $shipyardInstance = self::createShipyard($harborInstance, $shipyardName);
 

diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php
index 1e1bb2a69ea18ae5659c4d8969876a5301bc0306..eb3ac291f22e87a921760801c4717487b2810a52 100644 (file)
--- a/application/ship-simu/main/drives/motor/class_Motor.php
+++ b/application/ship-simu/main/drives/motor/class_Motor.php
@@ -46,7 +46,7 @@ class Motor extends BaseDrive implements ItemIsTradeable, ConstructableShipPart
        }
 
        // Einen Motor erstellen
        }
 
        // Einen Motor erstellen

-       public static function createMotor ($descr, $hp, $cams, $w, $h, $l) {
+       public final static function createMotor ($descr, $hp, $cams, $w, $h, $l) {

                // Get new instance
                $motorInstance = new Motor();
 
                // Get new instance
                $motorInstance = new Motor();
 

diff --git a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
index 2367ab71ceaee9a15e0efd712613ad3b475784c8..c89a0a03bd27d49fe06f5d6dd9b568ecbf1225fb 100644 (file)
--- a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
+++ b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php
@@ -46,7 +46,7 @@ class MaschineRoom extends BaseShipPart {
        }
 
        // Maschinenraum erstellen
        }
 
        // Maschinenraum erstellen

-       public static function createMaschineRoom () {
+       public final static function createMaschineRoom () {

                // Get new instance
                $roomInstance = new MaschineRoom();
 
                // Get new instance
                $roomInstance = new MaschineRoom();
 

diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php
index f04a029070d822c4d6b4133fe25b084a4890a624..1130bdbcda09cb7cd58d7e25acfc09f14c9e1844 100644 (file)
--- a/application/ship-simu/main/personell/class_SimulatorPersonell.php
+++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php
@@ -78,7 +78,7 @@ class SimulatorPersonell extends BasePersonell {
         * @return      $personellInstance              An instance of this object with a
         *                                                              list of personells
         */
         * @return      $personellInstance              An instance of this object with a
         *                                                              list of personells
         */

-       public static function createSimulatorPersonell ($amountPersonell) {
+       public final static function createSimulatorPersonell ($amountPersonell) {

                // Make sure only integer can pass
                $amountPersonell = (int) $amountPersonell;
 
                // Make sure only integer can pass
                $amountPersonell = (int) $amountPersonell;
 

diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
index 970017b0cee96d60f7cfaa9653441ee7c4a648b3..ae73132da98c3da3cd41ed5b5c820c4d90291f0d 100644 (file)
--- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php
+++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php
@@ -49,7 +49,7 @@ class CompanyEmployee extends SimulatorPersonell {
        }
 
        // Generate a specified amount of personell
        }
 
        // Generate a specified amount of personell

-       public static function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) {
+       public final static function createCompanyEmployee ($surname, $family, $gender, $year, $month, $day, $married, $salary) {

                // Get instance
                $personellInstance = new CompanyEmployee();
 
                // Get instance
                $personellInstance = new CompanyEmployee();
 

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index 23a6c3eacba2a95e52da65b5a8ddd3fae9665ca0..947bba2cfa074ee4a0c339d61197cbd1e11d429f 100644 (file)
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -47,7 +47,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
        }
 
        // Passagier-Schiff erstellen
        }
 
        // Passagier-Schiff erstellen

-       public static function createPassengerShip ($shipName) {
+       public final static function createPassengerShip ($shipName) {

                // Get new instance
                $passInstance = new PassengerShip();
 
                // Get new instance
                $passInstance = new PassengerShip();
 

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 52cf199fffafd2c9d42cea517b0a1f0404aa26d9..851c69e491af667b6e88ae31ca630b957f02e109 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
@@ -46,7 +46,7 @@ class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
        }
 
        // Economy-Kabine erstellen
        }
 
        // Economy-Kabine erstellen

-       public static function createEconomyCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public final static function createEconomyCabin ($numLuxury, $numRooms, $numBeds, $dim) {

                // Get new instance
                $ecoInstance = new EconomyCabin();
 
                // Get new instance
                $ecoInstance = new EconomyCabin();
 

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 bdb6796fbfb0b74f53edcfb47799c9375e3522bd..bef1817b3780dd2aa2db82df89a315dc64c79be7 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
@@ -44,7 +44,7 @@ class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPa
        }
 
        // 2-Sterne-Klasse erstellen
        }
 
        // 2-Sterne-Klasse erstellen

-       public static function createLowCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public final static function createLowCabin ($numLuxury, $numRooms, $numBeds, $dim) {

                // Get new instance
                $lowInstance = new LowCabin();
 
                // Get new instance
                $lowInstance = new LowCabin();
 

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 25c0dd4a7c6fadf42968f88988529cabe3393e55..4b330ffa35b0d445b988dd7d23f67402164f7f98 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
@@ -44,7 +44,7 @@ class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShi
        }
 
        // Eine Luxuskabine erstellen
        }
 
        // Eine Luxuskabine erstellen

-       public static function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public final static function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {

                // Get new instance
                $luxuryInstance = new LuxuryCabin();
 
                // Get new instance
                $luxuryInstance = new LuxuryCabin();
 

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 3be9a95b0c4c45367d156d0fd0012c5af66428e8..92ca60b7baa5d1b607e58da6b91a4f856c629adf 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
@@ -44,7 +44,7 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh
        }
 
        // Premier-Kabine erstellen
        }
 
        // Premier-Kabine erstellen

-       public static function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public final static function createPremierCabin ($numLuxury, $numRooms, $numBeds, $dim) {

                // Get new instance
                $premierInstance = new PremierCabin();
 
                // Get new instance
                $premierInstance = new PremierCabin();
 

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 7369fd29eaca7736ea6397c7ee3b011d33c95a5a..1dcc45709e02a449bb154ef32b5e99322d22ce9f 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
@@ -44,7 +44,7 @@ class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart
        }
 
        // Autodeck erstellen
        }
 
        // Autodeck erstellen

-       public static function createCarDeck ($numDecks, $dim) {
+       public final static function createCarDeck ($numDecks, $dim) {

                // Get new instance
                $carInstance = new CarDeck();
 
                // Get new instance
                $carInstance = new CarDeck();
 

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 d9c799068c08e697012a16382bed92c8697fd5eb..d63d17388724ed7167e7a0dcc08edb9418092bf2 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
@@ -44,7 +44,7 @@ class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa
        }
 
        // LKW-Deck erstellen
        }
 
        // LKW-Deck erstellen

-       public static function createTrainDeck ($numDecks, $dim) {
+       public final static function createTrainDeck ($numDecks, $dim) {

                // Get new instance
                $trainInstance = new TrainDeck();
 
                // Get new instance
                $trainInstance = new TrainDeck();
 

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 04823a298468a5a22b7063e0ab64d042a7a4ad44..112c282453583df641adaf3e8e364e7ba1ad0ef5 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
@@ -45,7 +45,7 @@ class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa
        }
 
        // LKW-Deck erstellen
        }
 
        // LKW-Deck erstellen

-       public static function createTruckDeck ($numDecks, $dim) {
+       public final static function createTruckDeck ($numDecks, $dim) {

                // Get new instance
                $truckInstance = new TruckDeck();
 
                // Get new instance
                $truckInstance = new TruckDeck();
 

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 7f0fce44d3105418e0ba5f55f5c320dd42f5f19f..995b7a2d4d231796fd7d300b3e416a680707e984 100644 (file)
--- a/application/ship-simu/main/structures/extended/upper/class_Bridge.php
+++ b/application/ship-simu/main/structures/extended/upper/class_Bridge.php
@@ -45,7 +45,7 @@ class Bridge extends BaseUpperStructure implements ItemIsTradeable, Constructabl
        }
 
        // Eine Kommandobruecke erstellen
        }
 
        // Eine Kommandobruecke erstellen

-       public static function createBridge ($width, $height, $length) {
+       public final static function createBridge ($width, $height, $length) {

                // Get new instance
                $bridgeInstance = new Bridge();
 
                // Get new instance
                $bridgeInstance = new Bridge();