From 42b66268af2c7d8872aca3e2fffb76d60954e9f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 13 Mar 2008 20:55:28 +0000 Subject: [PATCH] 'final' added to factory methods --- application/selector/class_ApplicationSelector.php | 2 +- application/ship-simu/main/class_Merchant.php | 2 +- application/ship-simu/main/class_WorksContract.php | 2 +- application/ship-simu/main/companies/class_ShippingCompany.php | 2 +- .../ship-simu/main/constructions/harbors/class_Harbor.php | 2 +- .../ship-simu/main/constructions/yards/class_Shipyard.php | 2 +- application/ship-simu/main/drives/motor/class_Motor.php | 2 +- .../ship-simu/main/parts/maschineroom/class_MaschineRoom.php | 2 +- .../ship-simu/main/personell/class_SimulatorPersonell.php | 2 +- .../ship-simu/main/personell/company/class_CompanyEmployee.php | 2 +- .../ship-simu/main/ships/passenger/class_PassengerShip.php | 2 +- .../structures/extended/cabines/ship/class_EconomyCabin.php | 2 +- .../main/structures/extended/cabines/ship/class_LowCabin.php | 2 +- .../main/structures/extended/cabines/ship/class_LuxuryCabin.php | 2 +- .../structures/extended/cabines/ship/class_PremierCabin.php | 2 +- .../main/structures/extended/decks/cargo/class_CarDeck.php | 2 +- .../main/structures/extended/decks/cargo/class_TrainDeck.php | 2 +- .../main/structures/extended/decks/cargo/class_TruckDeck.php | 2 +- .../ship-simu/main/structures/extended/upper/class_Bridge.php | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index c47ef87..b0866dc 100644 --- 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 */ - public static function createApplicationSelector (ManageableLanguage $langInstance, FileIOHandler $fileIOInstance) { + public final static function createApplicationSelector (ManageableLanguage $langInstance, FileIOHandler $fileIOInstance) { // 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 40d2207..3a2b892 100644 --- 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 - public static function createMerchant ($merchantName, Harbor $harborInstance) { + public final static function createMerchant ($merchantName, Harbor $harborInstance) { // String absichern $merchantName = (string) $merchantName; diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php index 0504fa5..1613d74 100644 --- 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 - 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; diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php index 8bb077c..18c0e74 100644 --- 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) - public static function createShippingCompany ($companyName, Harbor $hqInstance) { + public final static function createShippingCompany ($companyName, Harbor $hqInstance) { // 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 ce273ad..7c1ce55 100644 --- 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 - public static function createHarbor ($harborName) { + public final static function createHarbor ($harborName) { // 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 050f0d7..18a018e 100644 --- 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 - 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); diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php index 1e1bb2a..eb3ac29 100644 --- 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 - 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(); diff --git a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php index 2367ab7..c89a0a0 100644 --- 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 - public static function createMaschineRoom () { + public final static function createMaschineRoom () { // 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 f04a029..1130bdb 100644 --- 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 */ - public static function createSimulatorPersonell ($amountPersonell) { + public final static function createSimulatorPersonell ($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 970017b..ae73132 100644 --- 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 - 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(); diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php index 23a6c3e..947bba2 100644 --- 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 - public static function createPassengerShip ($shipName) { + public final static function createPassengerShip ($shipName) { // 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 52cf199..851c69e 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 @@ -46,7 +46,7 @@ class EconomyCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh } // 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(); 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 bdb6796..bef1817 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 @@ -44,7 +44,7 @@ class LowCabin extends BaseCabin implements ItemIsTradeable, ConstructableShipPa } // 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(); 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 25c0dd4..4b330ff 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 @@ -44,7 +44,7 @@ class LuxuryCabin extends BaseCabin implements ItemIsTradeable, ConstructableShi } // 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(); 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 3be9a95..92ca60b 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 @@ -44,7 +44,7 @@ class PremierCabin extends BaseCabin implements ItemIsTradeable, ConstructableSh } // 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(); 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 7369fd2..1dcc457 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 @@ -44,7 +44,7 @@ class CarDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPart } // Autodeck erstellen - public static function createCarDeck ($numDecks, $dim) { + public final static function createCarDeck ($numDecks, $dim) { // 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 d9c7990..d63d173 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 @@ -44,7 +44,7 @@ class TrainDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa } // LKW-Deck erstellen - public static function createTrainDeck ($numDecks, $dim) { + public final static function createTrainDeck ($numDecks, $dim) { // 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 04823a2..112c282 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 @@ -45,7 +45,7 @@ class TruckDeck extends BaseDeck implements ItemIsTradeable, ConstructableShipPa } // LKW-Deck erstellen - public static function createTruckDeck ($numDecks, $dim) { + public final static function createTruckDeck ($numDecks, $dim) { // 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 7f0fce4..995b7a2 100644 --- 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 - public static function createBridge ($width, $height, $length) { + public final static function createBridge ($width, $height, $length) { // Get new instance $bridgeInstance = new Bridge(); -- 2.30.2