From 1d128d8532290e84885d09d2d3f0060abd08e49e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 12 Apr 2008 12:59:01 +0000 Subject: [PATCH] Method constructor() removed, several small fixes --- .../selector/class_ApplicationHelper.php | 10 ++--- .../selector/class_ApplicationSelector.php | 8 ++-- application/selector/debug.php | 2 +- application/selector/exceptions.php | 2 +- application/selector/init.php | 2 +- application/selector/loader.php | 2 +- application/selector/starter.php | 2 +- .../ship-simu/class_ApplicationHelper.php | 10 ++--- application/ship-simu/debug.php | 2 +- application/ship-simu/exceptions.php | 2 +- .../class_BirthdayInvalidException.php | 2 +- .../class_CabinShipMismatchException.php | 2 +- .../class_ContractAllreadySignedException.php | 2 +- ...class_ContractPartnerMismatchException.php | 2 +- .../class_DeckShipMismatchException.php | 2 +- .../class_EmptyStructuresListException.php | 2 +- .../class_InvalidContractPartnerException.php | 4 +- .../class_InvalidIDFormatException.php | 2 +- .../class_ItemNotInPriceListException.php | 4 +- .../class_ItemNotTradeableException.php | 4 +- .../class_MissingSimulatorIDException.php | 2 +- .../class_MotorShipMismatchException.php | 2 +- .../class_NoShipyardsConstructedException.php | 2 +- ...s_PersonellListAlreadyCreatedException.php | 2 +- .../class_RoomShipMismatchException.php | 2 +- .../class_ShipNotConstructedException.php | 2 +- ...lass_ShipPartNotConstructableException.php | 2 +- .../class_StructureShipMismatchException.php | 2 +- .../class_StructuresOutOfBoundsException.php | 2 +- .../class_ToMuchEmployeesException.php | 2 +- ...class_TotalPriceNotCalculatedException.php | 2 +- ...ass_UnsupportedLimitationPartException.php | 2 +- .../class_WrongGenderSpecifiedException.php | 2 +- application/ship-simu/init.php | 2 +- .../interfaces/class_ConstructableShip.php | 2 +- .../class_ConstructableShipPart.php | 2 +- .../interfaces/class_ContractPartner.php | 2 +- .../ship-simu/interfaces/class_Customer.php | 2 +- .../interfaces/class_Personellizer.php | 2 +- .../interfaces/class_SignableContract.php | 2 +- .../interfaces/class_TradeableItem.php | 2 +- application/ship-simu/loader.php | 2 +- .../ship-simu/main/class_BasePersonell.php | 13 ++---- .../ship-simu/main/class_BaseSimulator.php | 44 +++++-------------- application/ship-simu/main/class_Merchant.php | 10 ++--- .../ship-simu/main/class_WorksContract.php | 24 +++++----- .../main/companies/class_ShippingCompany.php | 22 +++++----- .../main/constructions/berths/class_Berth.php | 8 ++-- .../constructions/class_BaseConstruction.php | 18 ++------ .../constructions/docks/class_DryDock.php | 8 ++-- .../constructions/harbors/class_Harbor.php | 8 ++-- .../terminals/class_Terminal.php | 8 ++-- .../constructions/yards/class_Shipyard.php | 8 ++-- .../ship-simu/main/drives/class_BaseDrive.php | 18 ++------ .../main/drives/motor/class_Motor.php | 10 ++--- .../main/parts/class_BaseShipPart.php | 18 ++------ .../parts/maschineroom/class_MaschineRoom.php | 8 ++-- .../personell/class_SimulatorPersonell.php | 10 ++--- .../company/class_CompanyEmployee.php | 8 ++-- .../ship-simu/main/ships/class_BaseShip.php | 20 +++------ .../ships/passenger/class_PassengerShip.php | 14 +++--- .../main/structures/class_BaseStructure.php | 18 ++------ .../extended/cabines/class_BaseCabin.php | 18 ++------ .../cabines/ship/class_EconomyCabin.php | 8 ++-- .../extended/cabines/ship/class_LowCabin.php | 8 ++-- .../cabines/ship/class_LuxuryCabin.php | 8 ++-- .../cabines/ship/class_PremierCabin.php | 8 ++-- .../extended/class_BaseCabinStructure.php | 22 +++------- .../extended/class_BaseDeckStructure.php | 22 +++------- .../extended/class_BaseUpperStructure.php | 15 ++----- .../extended/decks/cargo/class_CarDeck.php | 8 ++-- .../extended/decks/cargo/class_TrainDeck.php | 8 ++-- .../extended/decks/cargo/class_TruckDeck.php | 8 ++-- .../extended/decks/class_BaseDeck.php | 18 ++------ .../extended/upper/class_Bridge.php | 8 ++-- application/ship-simu/starter.php | 2 +- inc/classes.php | 2 +- .../exceptions/class_FrameworkException.php | 2 +- .../class_MismatchingCompressorsException.php | 2 +- .../class_ContainerItemIsNoArrayException.php | 2 +- .../class_ContainerItemIsNullException.php | 2 +- .../class_ContainerMaybeDamagedException.php | 2 +- .../class_SavePathIsEmptyException.php | 2 +- .../class_SavePathIsNoDirectoryException.php | 2 +- .../class_SavePathReadProtectedException.php | 2 +- .../class_SavePathWriteProtectedException.php | 2 +- .../io/class_DirPointerNotOpenedException.php | 2 +- .../class_FilePointerNotOpenedException.php | 2 +- .../io/class_InvalidDataLengthException.php | 2 +- ...lass_InvalidDirectoryResourceException.php | 2 +- .../io/class_InvalidMD5ChecksumException.php | 2 +- .../io/class_PathIsEmptyException.php | 2 +- .../io/class_PathIsNoDirectoryException.php | 2 +- .../io/class_PathReadProtectedException.php | 2 +- ...ass_InvalidLanguagePathStringException.php | 2 +- .../class_LanguagePathIsEmptyException.php | 2 +- ...ass_LanguagePathIsNoDirectoryException.php | 2 +- ...ass_LanguagePathReadProtectedException.php | 2 +- .../class_MissingFileIoHandlerException.php | 2 +- .../class_MissingLanguageHandlerException.php | 2 +- .../main/class_ClassMismatchException.php | 2 +- .../main/class_ClassNotFoundException.php | 2 +- .../class_ConfigEntryIsEmptyException.php | 2 +- .../class_ConfigEntryNotFoundException.php | 2 +- .../class_DimNotFoundInArrayException.php | 2 +- .../class_ExceptionNotChangedException.php | 2 +- .../main/class_ExceptionNotFoundException.php | 2 +- .../main/class_GetterNotFoundException.php | 2 +- .../main/class_InvalidArrayCountException.php | 2 +- .../main/class_InvalidObjectException.php | 2 +- .../class_MissingArrayElementsException.php | 2 +- ...ingDecimalsThousandsSeperatorException.php | 2 +- .../main/class_MissingMethodException.php | 2 +- .../main/class_NoArrayCreatedException.php | 2 +- .../main/class_NoArrayException.php | 2 +- .../main/class_NoObjectException.php | 2 +- .../main/class_NullPointerException.php | 2 +- .../main/class_VariableIsNotSetException.php | 2 +- .../class_BasePathIsEmptyException.php | 2 +- .../class_BasePathIsNoDirectoryException.php | 2 +- .../class_BasePathReadProtectedException.php | 2 +- .../class_InvalidBasePathStringException.php | 2 +- ...s_InvalidTemplateVariableNameException.php | 2 +- .../class_UnexpectedTemplateTypeException.php | 2 +- ...ass_UnsupportedTemplateEngineException.php | 2 +- .../class_ViewHelperNotFoundException.php | 2 +- .../class_ManageableApplication.php | 2 +- inc/classes/interfaces/class_ | 2 +- .../interfaces/class_FrameworkInterface.php | 2 +- .../interfaces/commands/class_Commandable.php | 2 +- .../compressor/class_Compressor.php | 2 +- .../class_FrameworkDatabaseInterface.php | 2 +- .../class_DatabaseFrontendInterface.php | 2 +- .../middleware/class_DatabaseConnector.php | 2 +- .../interfaces/debug/class_Debugger.php | 2 +- .../extended/class_LimitableObject.php | 2 +- .../interfaces/io/class_Streamable.php | 2 +- .../io/file/class_FileInputStreamer.php | 2 +- .../io/file/class_FileOutputStreamer.php | 2 +- .../io/output/class_OutputStreamer.php | 2 +- .../language/class_ManageableLanguage.php | 2 +- .../interfaces/request/class_Requestable.php | 2 +- .../response/class_Responseable.php | 2 +- .../template/class_CompileableTemplate.php | 2 +- .../template/view/class_ViewHelper.php | 2 +- inc/classes/main/class_ | 4 +- .../main/class_BaseFrameworkSystem.php | 20 ++++----- .../main/class_FrameworkArrayObject.php | 10 ----- .../main/commands/class_BaseCommand.php | 16 ++----- inc/classes/main/commands/extended/class_ | 4 +- .../main/compressor/class_Bzip2Compressor.php | 6 +-- .../main/compressor/class_GzipCompressor.php | 6 +-- .../main/compressor/class_NullCompressor.php | 6 +-- .../main/console/class_ConsoleTools.php | 6 +-- .../main/controller/class_BaseController.php | 16 ++----- .../database/class_BaseDatabaseFrontend.php | 16 ++----- .../classes/class_LocalFileDatabase.php | 4 +- .../main/debug/class_DebugConsoleOutput.php | 6 +-- .../main/debug/class_DebugErrorLogOutput.php | 6 +-- .../main/debug/class_DebugWebOutput.php | 6 +-- .../main/extended/class_ObjectLimits.php | 6 +-- .../extended/class_SerializationContainer.php | 2 +- inc/classes/main/io/class_FileIOStream.php | 6 +-- .../io/class_FrameworkDirectoryPointer.php | 6 +-- .../io/class_FrameworkFileInputPointer.php | 6 +-- .../io/class_FrameworkFileOutputPointer.php | 6 +-- .../main/language/class_LanguageSystem.php | 6 +-- .../main/output/class_ConsoleOutput.php | 6 +-- inc/classes/main/output/class_WebOutput.php | 6 +-- .../main/request/class_HttpRequest.php | 6 +-- .../main/response/class_HttpResponse.php | 6 +-- .../main/template/class_TemplateEngine.php | 6 +-- .../middleware/class_BaseMiddleware.php | 18 ++------ .../compressor/class_CompressorChannel.php | 6 +-- .../database/class_DatabaseConnection.php | 8 ++-- .../debug/class_DebugMiddleware.php | 8 ++-- .../middleware/io/class_FileIOHandler.php | 8 ++-- inc/config.php | 2 +- inc/config/class_FrameworkConfiguration.php | 4 +- inc/database.php | 2 +- inc/database/lib-local.php | 2 +- inc/file_io.php | 2 +- inc/includes.php | 2 +- inc/language.php | 2 +- inc/loader/class_ClassLoader.php | 2 +- inc/output.php | 2 +- inc/selector.php | 2 +- 187 files changed, 401 insertions(+), 575 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 9e62fc0..3edc751 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -37,7 +37,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication { /** @@ -61,16 +61,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica private static $thisInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Application-Helper"); + $this->setObjectDescription("Application-Helper"); // Create an unique ID $this->createUniqueID(); diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index b29414a..a7f3294 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -22,7 +22,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ApplicationSelector extends BaseFrameworkSystem { /** @@ -54,12 +54,12 @@ class ApplicationSelector extends BaseFrameworkSystem { * * @return void */ - private function __construct() { + protected function __construct() { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Applikationswechsler"); + $this->setObjectDescription("Applikationswechsler"); // Create unique ID number $this->createUniqueID(); diff --git a/application/selector/debug.php b/application/selector/debug.php index 8046ad4..36ad6ef 100644 --- a/application/selector/debug.php +++ b/application/selector/debug.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // [EOF] diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php index ac62fc1..dcce075 100644 --- a/application/selector/exceptions.php +++ b/application/selector/exceptions.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Set the new handler diff --git a/application/selector/init.php b/application/selector/init.php index 9810579..08bd8ac 100644 --- a/application/selector/init.php +++ b/application/selector/init.php @@ -22,7 +22,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // // diff --git a/application/selector/loader.php b/application/selector/loader.php index 44dbb5c..71c44c6 100644 --- a/application/selector/loader.php +++ b/application/selector/loader.php @@ -18,7 +18,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Is the application instance set? diff --git a/application/selector/starter.php b/application/selector/starter.php index 0833cec..21d451a 100644 --- a/application/selector/starter.php +++ b/application/selector/starter.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Get the application helper instance diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php index 2a30101..ff8fe5e 100644 --- a/application/ship-simu/class_ApplicationHelper.php +++ b/application/ship-simu/class_ApplicationHelper.php @@ -37,7 +37,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication { /** @@ -61,16 +61,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica private static $thisInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Application-Helper"); + $this->setObjectDescription("Application-Helper"); // Create an unique ID $this->createUniqueID(); diff --git a/application/ship-simu/debug.php b/application/ship-simu/debug.php index d9fff10..c26ed79 100644 --- a/application/ship-simu/debug.php +++ b/application/ship-simu/debug.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Reederei-Objekt debuggen diff --git a/application/ship-simu/exceptions.php b/application/ship-simu/exceptions.php index 53e4b95..0e3c80c 100644 --- a/application/ship-simu/exceptions.php +++ b/application/ship-simu/exceptions.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Set the new handler diff --git a/application/ship-simu/exceptions/class_BirthdayInvalidException.php b/application/ship-simu/exceptions/class_BirthdayInvalidException.php index 913a429..84948f7 100644 --- a/application/ship-simu/exceptions/class_BirthdayInvalidException.php +++ b/application/ship-simu/exceptions/class_BirthdayInvalidException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BirthdayInvalidException extends FrameworkException { public function __construct (array $birthArray, $code) { diff --git a/application/ship-simu/exceptions/class_CabinShipMismatchException.php b/application/ship-simu/exceptions/class_CabinShipMismatchException.php index 735257f..11abaa1 100644 --- a/application/ship-simu/exceptions/class_CabinShipMismatchException.php +++ b/application/ship-simu/exceptions/class_CabinShipMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class CabinShipMismatchException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_ContractAllreadySignedException.php b/application/ship-simu/exceptions/class_ContractAllreadySignedException.php index b3f0e5e..3c11743 100644 --- a/application/ship-simu/exceptions/class_ContractAllreadySignedException.php +++ b/application/ship-simu/exceptions/class_ContractAllreadySignedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ContractAllreadySignedException extends FrameworkException { public function __construct (array $classArray, $code) { diff --git a/application/ship-simu/exceptions/class_ContractPartnerMismatchException.php b/application/ship-simu/exceptions/class_ContractPartnerMismatchException.php index fce9e7a..b8bdb69 100644 --- a/application/ship-simu/exceptions/class_ContractPartnerMismatchException.php +++ b/application/ship-simu/exceptions/class_ContractPartnerMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ContractPartnerMismatchException extends FrameworkException { public function __construct (array $classArray, $code) { diff --git a/application/ship-simu/exceptions/class_DeckShipMismatchException.php b/application/ship-simu/exceptions/class_DeckShipMismatchException.php index 03e3c67..4c89816 100644 --- a/application/ship-simu/exceptions/class_DeckShipMismatchException.php +++ b/application/ship-simu/exceptions/class_DeckShipMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DeckShipMismatchException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_EmptyStructuresListException.php b/application/ship-simu/exceptions/class_EmptyStructuresListException.php index cd01a1e..31cb6d4 100644 --- a/application/ship-simu/exceptions/class_EmptyStructuresListException.php +++ b/application/ship-simu/exceptions/class_EmptyStructuresListException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class EmptyStructuresListException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { diff --git a/application/ship-simu/exceptions/class_InvalidContractPartnerException.php b/application/ship-simu/exceptions/class_InvalidContractPartnerException.php index c0d0eb8..992e34e 100644 --- a/application/ship-simu/exceptions/class_InvalidContractPartnerException.php +++ b/application/ship-simu/exceptions/class_InvalidContractPartnerException.php @@ -19,14 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidContractPartnerException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { // Add a message around the missing class $message = sprintf("[%s:] %s ist kein gütiger Vertragspartner.", $class->__toString(), - $class->getPartDescr() + $class->getObjectDescription() ); // Call parent constructor diff --git a/application/ship-simu/exceptions/class_InvalidIDFormatException.php b/application/ship-simu/exceptions/class_InvalidIDFormatException.php index 295096a..ca795ce 100644 --- a/application/ship-simu/exceptions/class_InvalidIDFormatException.php +++ b/application/ship-simu/exceptions/class_InvalidIDFormatException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidIDFormatException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { diff --git a/application/ship-simu/exceptions/class_ItemNotInPriceListException.php b/application/ship-simu/exceptions/class_ItemNotInPriceListException.php index 8c12595..f6f20e7 100644 --- a/application/ship-simu/exceptions/class_ItemNotInPriceListException.php +++ b/application/ship-simu/exceptions/class_ItemNotInPriceListException.php @@ -19,14 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ItemNotInPriceListException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { // Add a message around the missing class $message = sprintf("[Merchant:] Preis für den Artikel %s %s nicht gefunden.", $class->__toString(), - $class->getPartDescr() + $class->getObjectDescription() ); // Call parent constructor diff --git a/application/ship-simu/exceptions/class_ItemNotTradeableException.php b/application/ship-simu/exceptions/class_ItemNotTradeableException.php index 496e4b0..b4ea989 100644 --- a/application/ship-simu/exceptions/class_ItemNotTradeableException.php +++ b/application/ship-simu/exceptions/class_ItemNotTradeableException.php @@ -19,14 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ItemNotTradeableException extends FrameworkException { public function __construct (array $classArray, $code) { // Add a message around the missing class $message = sprintf("[%s:] %s ist nicht handelbar!", $classArray[0]->__toString(), - $classArray[1]->getPartDescr() + $classArray[1]->getObjectDescription() ); // Call parent constructor diff --git a/application/ship-simu/exceptions/class_MissingSimulatorIDException.php b/application/ship-simu/exceptions/class_MissingSimulatorIDException.php index d66b6e5..aafb1ab 100644 --- a/application/ship-simu/exceptions/class_MissingSimulatorIDException.php +++ b/application/ship-simu/exceptions/class_MissingSimulatorIDException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingSimulatorIDException extends FrameworkException { public function __construct (array $classArray, $code) { diff --git a/application/ship-simu/exceptions/class_MotorShipMismatchException.php b/application/ship-simu/exceptions/class_MotorShipMismatchException.php index a86b6cb..8ea793d 100644 --- a/application/ship-simu/exceptions/class_MotorShipMismatchException.php +++ b/application/ship-simu/exceptions/class_MotorShipMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MotorShipMismatchException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php b/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php index ff01762..9600c57 100644 --- a/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class NoShipyardsConstructedException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { diff --git a/application/ship-simu/exceptions/class_PersonellListAlreadyCreatedException.php b/application/ship-simu/exceptions/class_PersonellListAlreadyCreatedException.php index eeee651..7386231 100644 --- a/application/ship-simu/exceptions/class_PersonellListAlreadyCreatedException.php +++ b/application/ship-simu/exceptions/class_PersonellListAlreadyCreatedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PersonellListAlreadyCreatedException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { diff --git a/application/ship-simu/exceptions/class_RoomShipMismatchException.php b/application/ship-simu/exceptions/class_RoomShipMismatchException.php index 8555420..9ef36c0 100644 --- a/application/ship-simu/exceptions/class_RoomShipMismatchException.php +++ b/application/ship-simu/exceptions/class_RoomShipMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class RoomShipMismatchException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_ShipNotConstructedException.php b/application/ship-simu/exceptions/class_ShipNotConstructedException.php index 576629f..9b98d8a 100644 --- a/application/ship-simu/exceptions/class_ShipNotConstructedException.php +++ b/application/ship-simu/exceptions/class_ShipNotConstructedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ShipNotConstructedException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php b/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php index 7202e97..2024316 100644 --- a/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php +++ b/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ShipPartNotConstructableException extends FrameworkException { public function __construct (array $partArray, $code) { diff --git a/application/ship-simu/exceptions/class_StructureShipMismatchException.php b/application/ship-simu/exceptions/class_StructureShipMismatchException.php index 73ef0c4..72c094c 100644 --- a/application/ship-simu/exceptions/class_StructureShipMismatchException.php +++ b/application/ship-simu/exceptions/class_StructureShipMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class StructureShipMismatchException extends FrameworkException { } diff --git a/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php b/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php index bd10fbc..0df9172 100644 --- a/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php +++ b/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class StructuresOutOfBoundsException extends FrameworkException { public function __construct ($idx, $code) { diff --git a/application/ship-simu/exceptions/class_ToMuchEmployeesException.php b/application/ship-simu/exceptions/class_ToMuchEmployeesException.php index b25e465..633da3e 100644 --- a/application/ship-simu/exceptions/class_ToMuchEmployeesException.php +++ b/application/ship-simu/exceptions/class_ToMuchEmployeesException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ToMuchEmployeesException extends FrameworkException { public function __construct ($amountArray, $code) { diff --git a/application/ship-simu/exceptions/class_TotalPriceNotCalculatedException.php b/application/ship-simu/exceptions/class_TotalPriceNotCalculatedException.php index fb11e1b..66e7f67 100644 --- a/application/ship-simu/exceptions/class_TotalPriceNotCalculatedException.php +++ b/application/ship-simu/exceptions/class_TotalPriceNotCalculatedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class TotalPriceNotCalculatedException extends FrameworkException { public function __construct (BaseFrameworkSystem $class, $code) { diff --git a/application/ship-simu/exceptions/class_UnsupportedLimitationPartException.php b/application/ship-simu/exceptions/class_UnsupportedLimitationPartException.php index ce02a79..b46b92c 100644 --- a/application/ship-simu/exceptions/class_UnsupportedLimitationPartException.php +++ b/application/ship-simu/exceptions/class_UnsupportedLimitationPartException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class UnsupportedLimitationPartException extends FrameworkException { public function __construct ($str, $code) { diff --git a/application/ship-simu/exceptions/class_WrongGenderSpecifiedException.php b/application/ship-simu/exceptions/class_WrongGenderSpecifiedException.php index d3802d4..d6d0def 100644 --- a/application/ship-simu/exceptions/class_WrongGenderSpecifiedException.php +++ b/application/ship-simu/exceptions/class_WrongGenderSpecifiedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class WrongGenderSpecifiedException extends FrameworkException { public function __construct ($gender, $code) { diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php index 789420f..558c811 100644 --- a/application/ship-simu/init.php +++ b/application/ship-simu/init.php @@ -30,7 +30,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Get an instance of the helper diff --git a/application/ship-simu/interfaces/class_ConstructableShip.php b/application/ship-simu/interfaces/class_ConstructableShip.php index 8f214c7..5984b08 100644 --- a/application/ship-simu/interfaces/class_ConstructableShip.php +++ b/application/ship-simu/interfaces/class_ConstructableShip.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ConstructableShip extends FrameworkInterface { } diff --git a/application/ship-simu/interfaces/class_ConstructableShipPart.php b/application/ship-simu/interfaces/class_ConstructableShipPart.php index 0ca9231..76c161a 100644 --- a/application/ship-simu/interfaces/class_ConstructableShipPart.php +++ b/application/ship-simu/interfaces/class_ConstructableShipPart.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ConstructableShipPart extends FrameworkInterface { } diff --git a/application/ship-simu/interfaces/class_ContractPartner.php b/application/ship-simu/interfaces/class_ContractPartner.php index f36a91e..46075af 100644 --- a/application/ship-simu/interfaces/class_ContractPartner.php +++ b/application/ship-simu/interfaces/class_ContractPartner.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ContractPartner extends FrameworkInterface { /** diff --git a/application/ship-simu/interfaces/class_Customer.php b/application/ship-simu/interfaces/class_Customer.php index aa46e01..613df6b 100644 --- a/application/ship-simu/interfaces/class_Customer.php +++ b/application/ship-simu/interfaces/class_Customer.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Customer extends FrameworkInterface { /** diff --git a/application/ship-simu/interfaces/class_Personellizer.php b/application/ship-simu/interfaces/class_Personellizer.php index e528625..a1ee62e 100644 --- a/application/ship-simu/interfaces/class_Personellizer.php +++ b/application/ship-simu/interfaces/class_Personellizer.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Personellizer extends FrameworkInterface { /////////////////////// diff --git a/application/ship-simu/interfaces/class_SignableContract.php b/application/ship-simu/interfaces/class_SignableContract.php index 8834d17..a4fe7aa 100644 --- a/application/ship-simu/interfaces/class_SignableContract.php +++ b/application/ship-simu/interfaces/class_SignableContract.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface SignableContract extends FrameworkInterface { // Sign the contract diff --git a/application/ship-simu/interfaces/class_TradeableItem.php b/application/ship-simu/interfaces/class_TradeableItem.php index a746838..c430ee0 100644 --- a/application/ship-simu/interfaces/class_TradeableItem.php +++ b/application/ship-simu/interfaces/class_TradeableItem.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface TradeableItem extends FrameworkInterface { /** diff --git a/application/ship-simu/loader.php b/application/ship-simu/loader.php index e44ed0f..16bbaf9 100644 --- a/application/ship-simu/loader.php +++ b/application/ship-simu/loader.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Is the application instance set? diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php index d77fbaa..744c160 100644 --- a/application/ship-simu/main/class_BasePersonell.php +++ b/application/ship-simu/main/class_BasePersonell.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BasePersonell extends BaseFrameworkSystem implements Personellizer { // Maximum/minimum age @@ -48,20 +48,15 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer { private $salary = 0.00; // Constructor - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.
\n"); // Set description - $this->setPartDescr("Personal"); - } - - // Calls the constructor - public function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Personal"); } // Remove min/max ages diff --git a/application/ship-simu/main/class_BaseSimulator.php b/application/ship-simu/main/class_BaseSimulator.php index ec3fe30..0ca7a91 100644 --- a/application/ship-simu/main/class_BaseSimulator.php +++ b/application/ship-simu/main/class_BaseSimulator.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseSimulator extends BaseFrameworkSystem { // Schiffsteilinstanz @@ -42,16 +42,16 @@ class BaseSimulator extends BaseFrameworkSystem { ); // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Call highest constructor - parent::constructor($class); + parent::__construct($class); if ((defined('DEBUG_CORE')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", $this->__toString() )); // Set part description and class name - $this->setPartDescr("Simulator-Basis-Einheit"); + $this->setObjectDescription("Simulator-Basis-Einheit"); // Clean up a little, dies sollte ganz zum Schluss erfolgen! $this->removeResizeFactorArray(); @@ -59,28 +59,6 @@ class BaseSimulator extends BaseFrameworkSystem { $this->removeCurrShip(); } - // Public constructor - public function constructor ($class) { - // Call real constructor - $this->__construct($class); - } - - // Magic __isset method - private function __isset ($var) { - if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Checking %s in class.
\n", - $this->__toString(), $var - )); - return isset($this->$var); - } - - // Magic __unset method - private function __unset($var) { - if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Removing %s from class.
\n", - $this->__toString(), $var - )); - unset($this->$var); - } - // Setter-Methode fuer Laenge public final function setLength ($length) { if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] %dm Länge gesetzt.
\n", @@ -177,7 +155,7 @@ class BaseSimulator extends BaseFrameworkSystem { if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Maschinenraum mit Motor %s wird fuer das Schiff %s konstruiert.
\n", $this->__toString(), - $this->getCurrPart()->getPartDescr(), + $this->getCurrPart()->getObjectDescription(), $this->currShip->getShipName() )); @@ -186,7 +164,7 @@ class BaseSimulator extends BaseFrameworkSystem { // Berechnungen fuer umliegendes Objekt anpassen if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Das Schiffsteil %s vom Typ %s passt in das Schiff %s hinein.
\n", $this->__toString(), - $this->getCurrPart()->getPartDescr(), + $this->getCurrPart()->getObjectDescription(), $this->getCurrPart()->__toString(), $this->currShip->getShipName() )); @@ -203,7 +181,7 @@ class BaseSimulator extends BaseFrameworkSystem { // Das passt auch, dann Werte setzen und Motor-Instanz merken if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Das Schiffsteil %s passt in das Schiff %s hinein.
\n", $this->__toString(), - $this->getPartDescr(), + $this->getObjectDescription(), $this->currShip->getShipName() )); $this->setWidth($this->newWidth); @@ -216,7 +194,7 @@ class BaseSimulator extends BaseFrameworkSystem { // Passt nicht! Also wieder Exception werfen... throw new StructureShipMismatchException(sprintf("[%s:] Das Schiffsteil %s vom Typ %s ist zu gross für das Schiff!", $this->getCurrPart()->__toString(), - $this->getCurrPart()->getPartDescr(), + $this->getCurrPart()->getObjectDescription(), $this->getCurrPart()->__toString() ), 2); } @@ -232,7 +210,7 @@ class BaseSimulator extends BaseFrameworkSystem { // Debug-Meldung ausgeben if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Schiffsteil %s gefunden.
\n", $this->getCurrPart()->realClass, - $this->getCurrPart()->getPartDescr() + $this->getCurrPart()->getObjectDescription() )); // Schiffsteil-Instanz setzen @@ -248,7 +226,7 @@ class BaseSimulator extends BaseFrameworkSystem { // Exception werfen! throw new StructureShipMismatchException(sprintf("[%s:] Das Schiffsteil %s vom Typ %s passt nicht in das Schiff!", $this->getCurrPart()->realClass, - $this->getCurrPart()->getPartDescr(), + $this->getCurrPart()->getObjectDescription(), $this->getCurrPart()->__toString() ), 1); } @@ -400,7 +378,7 @@ class BaseSimulator extends BaseFrameworkSystem { public function extractDimensions ($dim) { if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] extractDimensions erreicht für %s.
\n", $this->__toString(), - $this->getPartDescr() + $this->getObjectDescription() )); // Abmasse setzen diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php index c40f236..ce65713 100644 --- a/application/ship-simu/main/class_Merchant.php +++ b/application/ship-simu/main/class_Merchant.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Merchant extends BaseFrameworkSystem { // Name des Haendlers @@ -32,9 +32,9 @@ class Merchant extends BaseFrameworkSystem { private $harborInstance = null; // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -45,7 +45,7 @@ class Merchant extends BaseFrameworkSystem { } // Set description - $this->setPartDescr("Händler"); + $this->setObjectDescription("Händler"); // Generate unique ID number $this->createUniqueID(); @@ -152,7 +152,7 @@ class Merchant extends BaseFrameworkSystem { __LINE__, $this->getMerchantName(), $itemInstance->__toString(), - $itemInstance->getPartDescr(), + $itemInstance->getObjectDescription(), $this->formatCurrency($price) )); diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php index aaa597f..96f1bca 100644 --- a/application/ship-simu/main/class_WorksContract.php +++ b/application/ship-simu/main/class_WorksContract.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class WorksContract extends BaseFrameworkSystem implements SignableContract { // Zukuenftiger Schiffsname @@ -41,9 +41,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { private $merchantInstance = null; // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -54,7 +54,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { } // Set description - $this->setPartDescr("Bauvertrag"); + $this->setObjectDescription("Bauvertrag"); // Unique-ID generieren $this->createUniqueID(); @@ -89,7 +89,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { __CLASS__, __LINE__, $shipName, - $partnerInstance->getPartDescr(), + $partnerInstance->getObjectDescription(), $partnerInstance->getCompanyName() )); @@ -262,7 +262,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] %s kostet %s.
\n", __CLASS__, __LINE__, - $instance->getPartDescr(), + $instance->getObjectDescription(), $this->getMerchantInstance()->formatCurrency($price) )); @@ -273,7 +273,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] %s wurde in den Bauvertrag aufgenommen.
\n", __CLASS__, __LINE__, - $instance->getPartDescr() + $instance->getObjectDescription() )); } @@ -334,9 +334,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { $this->getDebugInstance()->output(sprintf("[%s:%d] Die %s %s stimmt einem Bauvertrag über das %s %s zu.
\n", __CLASS__, __LINE__, - $partnerInstance->getPartDescr(), + $partnerInstance->getObjectDescription(), $partnerInstance->getCompanyName(), - $this->getShipInstance()->getPartDescr(), + $this->getShipInstance()->getObjectDescription(), $this->getShipInstance()->getShipName() )); } else { @@ -344,11 +344,11 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { $this->getDebugInstance()->output(sprintf("[%s:%d] Die %s %s geht mit der %s %s einen Bauvertrag über das %s %s ein.
\n", __CLASS__, __LINE__, - $partnerInstance->getPartDescr(), + $partnerInstance->getObjectDescription(), $partnerInstance->getCompanyName(), - $partyInstance->getPartDescr(), + $partyInstance->getObjectDescription(), $partyInstance->getCompanyName(), - $this->getShipInstance()->getPartDescr(), + $this->getShipInstance()->getObjectDescription(), $this->getShipInstance()->getShipName() )); } diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php index d8c0425..b93efdb 100644 --- a/application/ship-simu/main/companies/class_ShippingCompany.php +++ b/application/ship-simu/main/companies/class_ShippingCompany.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner { /** @@ -67,9 +67,9 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -80,7 +80,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner } // Set description - $this->setPartDescr("Reederei"); + $this->setObjectDescription("Reederei"); // Generate unique ID number $this->createUniqueID(); @@ -229,7 +229,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $employeeInstance->getSurname(), $employeeInstance->getFamily(), $this->getCompanyName(), - $employeeInstance->getPartDescr(), + $employeeInstance->getObjectDescription(), $this->formatCurrency($employeeInstance->getSalary()) )); $this->employeeList->append($employeeInstance); @@ -301,7 +301,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Make this person employed and give him some money to work $employee->setEmployed(true); - $employee->setPartDescr($dummy->getPartDescr()); + $employee->setObjectDescription($dummy->getObjectDescription()); $employee->setRealClass($dummy->__toString()); $employee->increaseSalary((mt_rand(7, 14) * 100)); // Are 700 to 1400 EUR for the begin okay? @@ -448,7 +448,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner __CLASS__, __LINE__, $this->getCompanyName(), - $shipInstance->getPartDescr() + $shipInstance->getObjectDescription() )); // Iterate shipyard list @@ -503,7 +503,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner __LINE__, $this->getCompanyName(), $contractInstance->getShipName(), - $shipInstance->getPartDescr() + $shipInstance->getObjectDescription() )); // Now check if the ship type is in any list and return the result @@ -568,7 +568,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner __CLASS__, __LINE__, $this->getCompanyName(), - $contractInstance->getShipInstance()->getPartDescr(), + $contractInstance->getShipInstance()->getObjectDescription(), $contractInstance->getShipInstance()->getShipName() )); $this->contractList->append($contractInstance); @@ -606,7 +606,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner __CLASS__, __LINE__, $this->getCompanyName(), - $contractInstance->getShipInstance()->getPartDescr(), + $contractInstance->getShipInstance()->getObjectDescription(), $contractInstance->getShipInstance()->getShipName() )); } else { @@ -615,7 +615,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner __CLASS__, __LINE__, $this->getCompanyName(), - $contractInstance->getShipInstance()->getPartDescr(), + $contractInstance->getShipInstance()->getObjectDescription(), $contractInstance->getShipInstance()->getShipName(), $partnerInstance->getCompanyName() )); diff --git a/application/ship-simu/main/constructions/berths/class_Berth.php b/application/ship-simu/main/constructions/berths/class_Berth.php index b802608..b8bd26c 100644 --- a/application/ship-simu/main/constructions/berths/class_Berth.php +++ b/application/ship-simu/main/constructions/berths/class_Berth.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Berth extends BaseConstruction { // Durchlaufende Nummer der Liegeplaetze @@ -29,7 +29,7 @@ class Berth extends BaseConstruction { private $harborInstance = null; // Konstruktor - private function __construct () { + protected function __construct () { if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", __CLASS__, @@ -38,10 +38,10 @@ class Berth extends BaseConstruction { } // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Liegeplatz"); + $this->setObjectDescription("Liegeplatz"); // 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 d97f279..24beedd 100644 --- a/application/ship-simu/main/constructions/class_BaseConstruction.php +++ b/application/ship-simu/main/constructions/class_BaseConstruction.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseConstruction extends BaseSimulator { // Tiefgang fuer z.B. Trockdocks private $draught = 0; // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Eltern-Konstrutor aufrufen - parent::constructor($class); + parent::__construct($class); // Debug message if ((defined('DEBUG_CORE')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", @@ -36,21 +36,11 @@ class BaseConstruction extends BaseSimulator { )); // Set description - $this->setPartDescr("Namenlose Landkonstruktion"); + $this->setObjectDescription("Namenlose Landkonstruktion"); // Clean up a little $this->removeNumberFormaters(); } - - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); - } } // [EOF] diff --git a/application/ship-simu/main/constructions/docks/class_DryDock.php b/application/ship-simu/main/constructions/docks/class_DryDock.php index e945128..879786d 100644 --- a/application/ship-simu/main/constructions/docks/class_DryDock.php +++ b/application/ship-simu/main/constructions/docks/class_DryDock.php @@ -19,21 +19,21 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DryDock extends BaseConstruction { // Zugewiesener Hafen private $harborInstance = null; // Konstruktor - private function __construct () { + protected function __construct () { if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[DryDock:] Konstruktor erreicht.
\n"); // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Trockendock"); + $this->setObjectDescription("Trockendock"); // 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 7c1ce55..e414118 100644 --- a/application/ship-simu/main/constructions/harbors/class_Harbor.php +++ b/application/ship-simu/main/constructions/harbors/class_Harbor.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Harbor extends BaseConstruction { // Namen des Hafens (z.B. Hamburger Hafen) @@ -35,15 +35,15 @@ class Harbor extends BaseConstruction { private $shipyardList = null; // Constructor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_HARBOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[Harbor:] Konstruktor erreicht.
\n"); // Set description - $this->setPartDescr("Hafen"); + $this->setObjectDescription("Hafen"); // Generate unique ID number $this->createUniqueID(); diff --git a/application/ship-simu/main/constructions/terminals/class_Terminal.php b/application/ship-simu/main/constructions/terminals/class_Terminal.php index aa38ee7..6ec76c2 100644 --- a/application/ship-simu/main/constructions/terminals/class_Terminal.php +++ b/application/ship-simu/main/constructions/terminals/class_Terminal.php @@ -19,14 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Terminal extends BaseConstruction { // Zugewiesener Hafen private $harborInstance = null; // Konstruktor - private function __construct () { + protected function __construct () { if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", __CLASS__, @@ -35,10 +35,10 @@ class Terminal extends BaseConstruction { } // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description - $this->setPartDescr("Anlegebrücke"); + $this->setObjectDescription("Anlegebrücke"); // 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 18a018e..2908484 100644 --- a/application/ship-simu/main/constructions/yards/class_Shipyard.php +++ b/application/ship-simu/main/constructions/yards/class_Shipyard.php @@ -20,7 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Shipyard extends BaseConstruction { // Werft-Name @@ -45,9 +45,9 @@ class Shipyard extends BaseConstruction { private $shippingCompany = null; // Constructor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -58,7 +58,7 @@ class Shipyard extends BaseConstruction { } // Set description - $this->setPartDescr("Werft"); + $this->setObjectDescription("Werft"); // Staff-Liste/Schiffstyp-Liste erzeugen $this->createStaffList(); diff --git a/application/ship-simu/main/drives/class_BaseDrive.php b/application/ship-simu/main/drives/class_BaseDrive.php index a8ed338..9e74079 100644 --- a/application/ship-simu/main/drives/class_BaseDrive.php +++ b/application/ship-simu/main/drives/class_BaseDrive.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseDrive extends BaseSimulator { // Price of this drive @@ -30,9 +30,9 @@ class BaseDrive extends BaseSimulator { private $numCams = 0; // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -43,23 +43,13 @@ class BaseDrive extends BaseSimulator { } // Set description - $this->setPartDescr("Namenloser Antrieb"); + $this->setObjectDescription("Namenloser Antrieb"); // Clean up a little $this->removeNumberFormaters(); $this->removePartInstance(); } - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); - } - // Setter-Methode fuert PS-Zahl public final function setHorsePower ($hp) { if ((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Antriebsleistung wird auf %d PS gesetzt.
\n", diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php index 9e347a8..699c721 100644 --- a/application/ship-simu/main/drives/motor/class_Motor.php +++ b/application/ship-simu/main/drives/motor/class_Motor.php @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { // Constructor - private function __construct() { + protected function __construct() { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -36,7 +36,7 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { } // Set description - $this->setPartDescr("Namenloser Motor"); + $this->setObjectDescription("Namenloser Motor"); // Generate unique ID number $this->createUniqueID(); @@ -58,7 +58,7 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { )); // Beschreibung und Abmasse setzen - $motorInstance->setPartDescr($descr); + $motorInstance->setObjectDescription($descr); $motorInstance->setWidth($w); $motorInstance->setHeight($h); $motorInstance->setLength($l); diff --git a/application/ship-simu/main/parts/class_BaseShipPart.php b/application/ship-simu/main/parts/class_BaseShipPart.php index 9bb8b6e..9f20617 100644 --- a/application/ship-simu/main/parts/class_BaseShipPart.php +++ b/application/ship-simu/main/parts/class_BaseShipPart.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseShipPart extends BaseSimulator { // Price of this ship part private $price = 0.00; // Konstruktor - private function __construct($class) { + protected function __construct($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_SHIPPART')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -39,22 +39,12 @@ class BaseShipPart extends BaseSimulator { } // Beschreibung - $this->setPartDescr("Schiffsteil"); + $this->setObjectDescription("Schiffsteil"); // Clean up a little $this->removeNumberFormaters(); } - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); - } - // Setter for price public final function setPrice ($price) { $this->price = (float) $price; diff --git a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php index c89a0a0..fdde326 100644 --- a/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php +++ b/application/ship-simu/main/parts/maschineroom/class_MaschineRoom.php @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MaschineRoom extends BaseShipPart { // Constructor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -36,7 +36,7 @@ class MaschineRoom extends BaseShipPart { } // Set description - $this->setPartDescr("Maschinenraum"); + $this->setObjectDescription("Maschinenraum"); // Generate unique ID number $this->createUniqueID(); diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php index 1d148dd..d5aa01e 100644 --- a/application/ship-simu/main/personell/class_SimulatorPersonell.php +++ b/application/ship-simu/main/personell/class_SimulatorPersonell.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class SimulatorPersonell extends BasePersonell { // Personell list @@ -32,20 +32,20 @@ class SimulatorPersonell extends BasePersonell { private $cacheCond = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); if (((defined('DEBUG_PERSONELL')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", $this->__toString() )); // Set description - $this->setPartDescr("Simulationspersonal"); + $this->setObjectDescription("Simulationspersonal"); // Create unique ID $this->createUniqueID(); diff --git a/application/ship-simu/main/personell/company/class_CompanyEmployee.php b/application/ship-simu/main/personell/company/class_CompanyEmployee.php index ae73132..b97f70c 100644 --- a/application/ship-simu/main/personell/company/class_CompanyEmployee.php +++ b/application/ship-simu/main/personell/company/class_CompanyEmployee.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class CompanyEmployee extends SimulatorPersonell { // Employeee list private $employeeList = null; // Constructor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if ((((defined('DEBUG_COMPANY_EMPLOYEE')) && (defined('DEBUG_PERSONELL'))) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -39,7 +39,7 @@ class CompanyEmployee extends SimulatorPersonell { } // Set description - $this->setPartDescr("Firmenangestellte(r)"); + $this->setObjectDescription("Firmenangestellte(r)"); // Create unique ID $this->createUniqueID(); diff --git a/application/ship-simu/main/ships/class_BaseShip.php b/application/ship-simu/main/ships/class_BaseShip.php index c4a548b..d4ffee9 100644 --- a/application/ship-simu/main/ships/class_BaseShip.php +++ b/application/ship-simu/main/ships/class_BaseShip.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseShip extends BaseSimulator { // Name des Shipes @@ -38,9 +38,9 @@ class BaseShip extends BaseSimulator { private $structures = null; // Namenloses Ship generieren - private function __construct($class) { + protected function __construct($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Beim Schiff angelangt if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) @@ -50,7 +50,7 @@ class BaseShip extends BaseSimulator { )); // Bezeichnung setzen - $this->setPartDescr("Schiff"); + $this->setObjectDescription("Schiff"); // Array-Objekt generieren $this->createStructuresArray(); @@ -60,16 +60,6 @@ class BaseShip extends BaseSimulator { $this->removeNumberFormaters(); } - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); - } - // Array-Objekt anlegen private function createStructuresArray () { $this->structures = new FrameworkArrayObject(); @@ -175,7 +165,7 @@ class BaseShip extends BaseSimulator { __CLASS__, __LINE__, $this->getShipName(), - $partInstance->getPartDescr() + $partInstance->getObjectDescription() )); // Alles klar! diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php index 947bba2..a581c12 100644 --- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php +++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php @@ -20,13 +20,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObject { // Konstruktor - private function __construct () { + protected function __construct () { // Eltern-Kontruktor aufrufen - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -37,7 +37,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje } // Set description - $this->setPartDescr("Passagier-Schiff"); + $this->setObjectDescription("Passagier-Schiff"); // Generate unique ID number $this->createUniqueID(); @@ -97,7 +97,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje $cab = $el->getPartInstance(); if (!is_null($cab)) { // Kabinenbeschreibung holen - $cabType = $cab->getPartDescr(); + $cabType = $cab->getObjectDescription(); } // Debug-Meldung ausgeben @@ -113,7 +113,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] %s ist keine Kabine.
\n", __CLASS__, __LINE__, - $el->getPartDescr() + $el->getObjectDescription() )); } } @@ -121,7 +121,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das %s mit dem Namen %s hat %d Betten.
\n", __CLASS__, __LINE__, - $this->getPartDescr(), + $this->getObjectDescription(), $this->getShipName(), $numBeds )); diff --git a/application/ship-simu/main/structures/class_BaseStructure.php b/application/ship-simu/main/structures/class_BaseStructure.php index 5259ca2..8620ce9 100644 --- a/application/ship-simu/main/structures/class_BaseStructure.php +++ b/application/ship-simu/main/structures/class_BaseStructure.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseStructure extends BaseSimulator { // Price of this structure private $price = 0.00; // Konstruktor (hier keine Exceptions aendern!) - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -39,22 +39,12 @@ class BaseStructure extends BaseSimulator { } // Set description - $this->setPartDescr("Schiffsstrukturen"); + $this->setObjectDescription("Schiffsstrukturen"); // Clean up a little $this->removeNumberFormaters(); } - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); - } - // Setter for price public final function setPrice ($price) { $this->price = (float) $price; 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 d009031..43e8a20 100644 --- a/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php +++ b/application/ship-simu/main/structures/extended/cabines/class_BaseCabin.php @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseCabin extends BaseCabinStructure { // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -36,17 +36,7 @@ class BaseCabin extends BaseCabinStructure { } // Set description - $this->setPartDescr("Kabine"); - } - - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Kabine"); } // Is this a cabin? 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 7b41210..6357461 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -36,7 +36,7 @@ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShip } // Set description - $this->setPartDescr("Economy-Class-Kabine"); + $this->setObjectDescription("Economy-Class-Kabine"); // Generate unique ID number $this->createUniqueID(); 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 ad0bc84..46e9880 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart )); // Set description - $this->setPartDescr("2Star-Class-Kabine"); + $this->setObjectDescription("2Star-Class-Kabine"); // Generate unique ID number $this->createUniqueID(); 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 95333fb..060060e 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP )); // Set description - $this->setPartDescr("Luxuskabine"); + $this->setObjectDescription("Luxuskabine"); // Generate unique ID number $this->createUniqueID(); 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 b4e5b74..020fd14 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[PremierCabin:] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip )); // Set description - $this->setPartDescr("Premier-Class-Kabine"); + $this->setObjectDescription("Premier-Class-Kabine"); // Generate unique ID number $this->createUniqueID(); diff --git a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php index cf50ce1..31253ae 100644 --- a/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php +++ b/application/ship-simu/main/structures/extended/class_BaseCabinStructure.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseCabinStructure extends BaseStructure { // --- Besondere Eigenschaften dazufuegen: --- @@ -33,9 +33,9 @@ class BaseCabinStructure extends BaseStructure { private $numBeds = 0; // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -46,17 +46,7 @@ class BaseCabinStructure extends BaseStructure { } // Set description - $this->setPartDescr("Kabinenstruktur"); - } - - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Kabinenstruktur"); } // Kabine hinzufuegen @@ -64,7 +54,7 @@ class BaseCabinStructure extends BaseStructure { if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine %s wird für das Schiff %s konstruiert.
\n", __CLASS__, __LINE__, - $cabinInstance->getPartDescr(), + $cabinInstance->getObjectDescription(), $shipInstance->getShipName() )); @@ -88,7 +78,7 @@ class BaseCabinStructure extends BaseStructure { if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine %s wurde in das Schiff eingebaut.
\n", __CLASS__, __LINE__, - $cabinInstance->getPartDescr(), + $cabinInstance->getObjectDescription(), $shipInstance->getShipName() )); } diff --git a/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php b/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php index e947673..53f6a9c 100644 --- a/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php +++ b/application/ship-simu/main/structures/extended/class_BaseDeckStructure.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseDeckStructure extends BaseStructure { // Anzahl Decks private $numDecks = 0; // Konstruktor - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -39,17 +39,7 @@ class BaseDeckStructure extends BaseStructure { } // Set description - $this->setPartDescr("Deckstruktur"); - } - - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Deckstruktur"); } // Deckstruktur dem Schiff hinzufuegen @@ -57,7 +47,7 @@ class BaseDeckStructure extends BaseStructure { if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das Deck %s wird für das Schiff %s konstruiert.
\n", __CLASS__, __LINE__, - $deckInstance->getPartDescr(), + $deckInstance->getObjectDescription(), $shipInstance->getShipName() )); @@ -71,7 +61,7 @@ class BaseDeckStructure extends BaseStructure { if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das Deck %s wurde in das Schiff %s eingebaut.
\n", __CLASS__, __LINE__, - $deckInstance->getPartDescr(), + $deckInstance->getObjectDescription(), $shipInstance->getShipName() )); } diff --git a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php index c930fee..74eb19b 100644 --- a/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php +++ b/application/ship-simu/main/structures/extended/class_BaseUpperStructure.php @@ -19,15 +19,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseUpperStructure extends BaseStructure { /** * Constructor for all super structures on a ship */ - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) { @@ -38,14 +38,7 @@ class BaseUpperStructure extends BaseStructure { } // Set description - $this->setPartDescr("Aufbauten"); - } - - /** - * Call new constructor - */ - function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Aufbauten"); } } 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 ca4a9dd..cf3289d 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { )); // Set description - $this->setPartDescr("Autodeck"); + $this->setObjectDescription("Autodeck"); // Generate unique ID number $this->createUniqueID(); 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 2c9bcbe..d464f77 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 @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart )); // Set description - $this->setPartDescr("Zug-Deck"); + $this->setObjectDescription("Zug-Deck"); // Generate unique ID number $this->createUniqueID(); 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 4f29d60..e23f894 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 @@ -20,13 +20,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { // Konstruktor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -35,7 +35,7 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart )); // Set description - $this->setPartDescr("LKW-Deck"); + $this->setObjectDescription("LKW-Deck"); // Generate unique ID number $this->createUniqueID(); 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 22da45c..13768b8 100644 --- a/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php +++ b/application/ship-simu/main/structures/extended/decks/class_BaseDeck.php @@ -19,15 +19,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseDeck extends BaseDeckStructure { /** * Constructor for cargo decks in general */ - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debub message if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -36,17 +36,7 @@ class BaseDeck extends BaseDeckStructure { )); // Set description - $this->setPartDescr("Allgemeines Deck"); - } - - /** - * Calls the private constructor - * - * @param $class The class' name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); + $this->setObjectDescription("Allgemeines Deck"); } /** 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 ec71072..239a717 100644 --- a/application/ship-simu/main/structures/extended/upper/class_Bridge.php +++ b/application/ship-simu/main/structures/extended/upper/class_Bridge.php @@ -19,13 +19,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableShipPart { // Constructor - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.
\n", @@ -34,7 +34,7 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS )); // Set description - $this->setPartDescr("Brücke"); + $this->setObjectDescription("Brücke"); // Generate unique ID number $this->createUniqueID(); diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php index 223ccc0..137ebbc 100644 --- a/application/ship-simu/starter.php +++ b/application/ship-simu/starter.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Is there an application helper instance? We need the method main() for diff --git a/inc/classes.php b/inc/classes.php index 64e2bed..4b52f3f 100644 --- a/inc/classes.php +++ b/inc/classes.php @@ -18,7 +18,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Lower framework classes diff --git a/inc/classes/exceptions/class_FrameworkException.php b/inc/classes/exceptions/class_FrameworkException.php index aaab83a..175b2b2 100644 --- a/inc/classes/exceptions/class_FrameworkException.php +++ b/inc/classes/exceptions/class_FrameworkException.php @@ -21,7 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ abstract class FrameworkException extends ReflectionException { /** diff --git a/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php b/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php index 2ca8d61..46f2563 100644 --- a/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php +++ b/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MismatchingCompressorsException extends FrameworkException { /** diff --git a/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php b/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php index 405c39b..6fdc825 100644 --- a/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php +++ b/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ContainerItemIsNoArrayException extends FrameworkException { /** diff --git a/inc/classes/exceptions/container/class_ContainerItemIsNullException.php b/inc/classes/exceptions/container/class_ContainerItemIsNullException.php index 2cfafc4..6f17940 100644 --- a/inc/classes/exceptions/container/class_ContainerItemIsNullException.php +++ b/inc/classes/exceptions/container/class_ContainerItemIsNullException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ContainerItemIsNullException extends FrameworkException { /** diff --git a/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php b/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php index 5668698..aa010fa 100644 --- a/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php +++ b/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ContainerMaybeDamagedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php b/inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php index efae626..7199369 100644 --- a/inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php +++ b/inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class SavePathIsEmptyException extends FrameworkException { /** diff --git a/inc/classes/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php b/inc/classes/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php index 964a8d4..8d2c89b 100644 --- a/inc/classes/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php +++ b/inc/classes/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class SavePathIsNoDirectoryException extends FrameworkException { /** diff --git a/inc/classes/exceptions/database/local_file/class_SavePathReadProtectedException.php b/inc/classes/exceptions/database/local_file/class_SavePathReadProtectedException.php index 26b86b3..d4a0de4 100644 --- a/inc/classes/exceptions/database/local_file/class_SavePathReadProtectedException.php +++ b/inc/classes/exceptions/database/local_file/class_SavePathReadProtectedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class SavePathReadProtectedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/inc/classes/exceptions/database/local_file/class_SavePathWriteProtectedException.php index 4ad2790..a19d667 100644 --- a/inc/classes/exceptions/database/local_file/class_SavePathWriteProtectedException.php +++ b/inc/classes/exceptions/database/local_file/class_SavePathWriteProtectedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class SavePathWriteProtectedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php b/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php index 060b017..6be3455 100644 --- a/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php +++ b/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DirPointerNotOpenedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php b/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php index 9c7a8a8..4ecfc2e 100644 --- a/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php +++ b/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class FilePointerNotOpenedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_InvalidDataLengthException.php b/inc/classes/exceptions/io/class_InvalidDataLengthException.php index bc74213..310ab0b 100644 --- a/inc/classes/exceptions/io/class_InvalidDataLengthException.php +++ b/inc/classes/exceptions/io/class_InvalidDataLengthException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidDataLengthException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php b/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php index 668b0f0..32de296 100644 --- a/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php +++ b/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidDirectoryResourceException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php b/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php index 1aabdb4..2e1a51d 100644 --- a/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php +++ b/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidMD5ChecksumException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_PathIsEmptyException.php b/inc/classes/exceptions/io/class_PathIsEmptyException.php index 4c93d20..77a4a54 100644 --- a/inc/classes/exceptions/io/class_PathIsEmptyException.php +++ b/inc/classes/exceptions/io/class_PathIsEmptyException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PathIsEmptyException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php b/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php index 2ff79ba..fbf4800 100644 --- a/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php +++ b/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PathIsNoDirectoryException extends FrameworkException { /** diff --git a/inc/classes/exceptions/io/class_PathReadProtectedException.php b/inc/classes/exceptions/io/class_PathReadProtectedException.php index 70ea7c0..14891d7 100644 --- a/inc/classes/exceptions/io/class_PathReadProtectedException.php +++ b/inc/classes/exceptions/io/class_PathReadProtectedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class PathReadProtectedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php b/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php index 5161c23..536a073 100644 --- a/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php +++ b/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidLanguagePathStringException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php b/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php index 653f4c0..e1aef2a 100644 --- a/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php +++ b/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class LanguagePathIsEmptyException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php index 6a672af..3772ee0 100644 --- a/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php +++ b/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class LanguagePathIsNoDirectoryException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php b/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php index ccfd2c3..1ac1a94 100644 --- a/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php +++ b/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class LanguagePathReadProtectedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php b/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php index 9a56466..f8d5e2d 100644 --- a/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php +++ b/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingFileIoHandlerException extends FrameworkException { /** diff --git a/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php b/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php index 4b2ef13..0a3171a 100644 --- a/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php +++ b/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingLanguageHandlerException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ClassMismatchException.php b/inc/classes/exceptions/main/class_ClassMismatchException.php index b482001..a17ecdf 100644 --- a/inc/classes/exceptions/main/class_ClassMismatchException.php +++ b/inc/classes/exceptions/main/class_ClassMismatchException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ClassMismatchException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ClassNotFoundException.php b/inc/classes/exceptions/main/class_ClassNotFoundException.php index b7242e7..ba1efd6 100644 --- a/inc/classes/exceptions/main/class_ClassNotFoundException.php +++ b/inc/classes/exceptions/main/class_ClassNotFoundException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ClassNotFoundException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php b/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php index f16e365..781adca 100644 --- a/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php +++ b/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ConfigEntryIsEmptyException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php b/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php index b753bdf..80cef7c 100644 --- a/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php +++ b/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ConfigEntryNotFoundException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php b/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php index 4e0bcfb..484a414 100644 --- a/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php +++ b/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DimNotFoundInArrayException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ExceptionNotChangedException.php b/inc/classes/exceptions/main/class_ExceptionNotChangedException.php index af6ae2c..e23adfa 100644 --- a/inc/classes/exceptions/main/class_ExceptionNotChangedException.php +++ b/inc/classes/exceptions/main/class_ExceptionNotChangedException.php @@ -20,7 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ExceptionNotChangedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_ExceptionNotFoundException.php b/inc/classes/exceptions/main/class_ExceptionNotFoundException.php index 33867ae..fe50215 100644 --- a/inc/classes/exceptions/main/class_ExceptionNotFoundException.php +++ b/inc/classes/exceptions/main/class_ExceptionNotFoundException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ExceptionNotFoundException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_GetterNotFoundException.php b/inc/classes/exceptions/main/class_GetterNotFoundException.php index 64a402b..c89c0d2 100644 --- a/inc/classes/exceptions/main/class_GetterNotFoundException.php +++ b/inc/classes/exceptions/main/class_GetterNotFoundException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class GetterNotFoundException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_InvalidArrayCountException.php b/inc/classes/exceptions/main/class_InvalidArrayCountException.php index 215d1ab..75fa544 100644 --- a/inc/classes/exceptions/main/class_InvalidArrayCountException.php +++ b/inc/classes/exceptions/main/class_InvalidArrayCountException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidArrayCountException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_InvalidObjectException.php b/inc/classes/exceptions/main/class_InvalidObjectException.php index 76a4a4c..08d92df 100644 --- a/inc/classes/exceptions/main/class_InvalidObjectException.php +++ b/inc/classes/exceptions/main/class_InvalidObjectException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidObjectException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_MissingArrayElementsException.php b/inc/classes/exceptions/main/class_MissingArrayElementsException.php index eed1c9b..5d483db 100644 --- a/inc/classes/exceptions/main/class_MissingArrayElementsException.php +++ b/inc/classes/exceptions/main/class_MissingArrayElementsException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingArrayElementsException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php b/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php index 771bf7b..8ccc62e 100644 --- a/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php +++ b/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingDecimalsThousandsSeperatorException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_MissingMethodException.php b/inc/classes/exceptions/main/class_MissingMethodException.php index d8bd326..8855e5d 100644 --- a/inc/classes/exceptions/main/class_MissingMethodException.php +++ b/inc/classes/exceptions/main/class_MissingMethodException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class MissingMethodException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_NoArrayCreatedException.php b/inc/classes/exceptions/main/class_NoArrayCreatedException.php index dd1e7fa..b741fdf 100644 --- a/inc/classes/exceptions/main/class_NoArrayCreatedException.php +++ b/inc/classes/exceptions/main/class_NoArrayCreatedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class NoArrayCreatedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_NoArrayException.php b/inc/classes/exceptions/main/class_NoArrayException.php index eacfca3..e885801 100644 --- a/inc/classes/exceptions/main/class_NoArrayException.php +++ b/inc/classes/exceptions/main/class_NoArrayException.php @@ -17,7 +17,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class NoArrayException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_NoObjectException.php b/inc/classes/exceptions/main/class_NoObjectException.php index c169685..8cd3c3e 100644 --- a/inc/classes/exceptions/main/class_NoObjectException.php +++ b/inc/classes/exceptions/main/class_NoObjectException.php @@ -21,7 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class NoObjectException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_NullPointerException.php b/inc/classes/exceptions/main/class_NullPointerException.php index 489465a..0a16aae 100644 --- a/inc/classes/exceptions/main/class_NullPointerException.php +++ b/inc/classes/exceptions/main/class_NullPointerException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class NullPointerException extends FrameworkException { /** diff --git a/inc/classes/exceptions/main/class_VariableIsNotSetException.php b/inc/classes/exceptions/main/class_VariableIsNotSetException.php index 9c9a51f..84daff1 100644 --- a/inc/classes/exceptions/main/class_VariableIsNotSetException.php +++ b/inc/classes/exceptions/main/class_VariableIsNotSetException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class VariableIsNotSetException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_BasePathIsEmptyException.php b/inc/classes/exceptions/template/class_BasePathIsEmptyException.php index e155afe..3009863 100644 --- a/inc/classes/exceptions/template/class_BasePathIsEmptyException.php +++ b/inc/classes/exceptions/template/class_BasePathIsEmptyException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BasePathIsEmptyException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php b/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php index 271b447..9dc01e2 100644 --- a/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php +++ b/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BasePathIsNoDirectoryException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_BasePathReadProtectedException.php b/inc/classes/exceptions/template/class_BasePathReadProtectedException.php index 5350717..37b10b2 100644 --- a/inc/classes/exceptions/template/class_BasePathReadProtectedException.php +++ b/inc/classes/exceptions/template/class_BasePathReadProtectedException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BasePathReadProtectedException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_InvalidBasePathStringException.php b/inc/classes/exceptions/template/class_InvalidBasePathStringException.php index 729aca9..095ed8b 100644 --- a/inc/classes/exceptions/template/class_InvalidBasePathStringException.php +++ b/inc/classes/exceptions/template/class_InvalidBasePathStringException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidBasePathStringException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php b/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php index 8a3151c..f625ccc 100644 --- a/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php +++ b/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class InvalidTemplateVariableNameException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php b/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php index b1d0d14..ba37050 100644 --- a/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php +++ b/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class UnexpectedTemplateTypeException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php b/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php index 9a8560a..a66fda3 100644 --- a/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php +++ b/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class UnsupportedTemplateEngineException extends FrameworkException { /** diff --git a/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php b/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php index 78cb673..ece8b34 100644 --- a/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php +++ b/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class ViewHelperNotFoundException extends FrameworkException { /** diff --git a/inc/classes/interfaces/application/class_ManageableApplication.php b/inc/classes/interfaces/application/class_ManageableApplication.php index f342a0a..81ff0c4 100644 --- a/inc/classes/interfaces/application/class_ManageableApplication.php +++ b/inc/classes/interfaces/application/class_ManageableApplication.php @@ -24,7 +24,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ManageableApplication extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/class_ b/inc/classes/interfaces/class_ index 906a8ad..1e4ea82 100644 --- a/inc/classes/interfaces/class_ +++ b/inc/classes/interfaces/class_ @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface extends FrameworkInterface { } diff --git a/inc/classes/interfaces/class_FrameworkInterface.php b/inc/classes/interfaces/class_FrameworkInterface.php index 733d665..2906fce 100644 --- a/inc/classes/interfaces/class_FrameworkInterface.php +++ b/inc/classes/interfaces/class_FrameworkInterface.php @@ -20,7 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface FrameworkInterface { } diff --git a/inc/classes/interfaces/commands/class_Commandable.php b/inc/classes/interfaces/commands/class_Commandable.php index e8397c5..ab5b53a 100644 --- a/inc/classes/interfaces/commands/class_Commandable.php +++ b/inc/classes/interfaces/commands/class_Commandable.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Commandable extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/compressor/class_Compressor.php b/inc/classes/interfaces/compressor/class_Compressor.php index 0e3182a..0ce342e 100644 --- a/inc/classes/interfaces/compressor/class_Compressor.php +++ b/inc/classes/interfaces/compressor/class_Compressor.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Compressor extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php b/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php index 3031f60..5605da3 100644 --- a/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php +++ b/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface FrameworkDatabaseInterface extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php b/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php index b6043b3..93bbd19 100644 --- a/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php +++ b/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php @@ -23,7 +23,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface DatabaseFrontendInterface extends FrameworkDatabaseInterface { /** diff --git a/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php b/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php index e9f5031..4945d14 100644 --- a/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php +++ b/inc/classes/interfaces/database/middleware/class_DatabaseConnector.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface DatabaseConnector extends FrameworkDatabaseInterface { } diff --git a/inc/classes/interfaces/debug/class_Debugger.php b/inc/classes/interfaces/debug/class_Debugger.php index eeffbf2..1b76bcf 100644 --- a/inc/classes/interfaces/debug/class_Debugger.php +++ b/inc/classes/interfaces/debug/class_Debugger.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Debugger extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/extended/class_LimitableObject.php b/inc/classes/interfaces/extended/class_LimitableObject.php index 591a21e..212e189 100644 --- a/inc/classes/interfaces/extended/class_LimitableObject.php +++ b/inc/classes/interfaces/extended/class_LimitableObject.php @@ -20,7 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface LimitableObject extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/io/class_Streamable.php b/inc/classes/interfaces/io/class_Streamable.php index 4763acb..ca1a76e 100644 --- a/inc/classes/interfaces/io/class_Streamable.php +++ b/inc/classes/interfaces/io/class_Streamable.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Streamable extends FrameworkInterface { } diff --git a/inc/classes/interfaces/io/file/class_FileInputStreamer.php b/inc/classes/interfaces/io/file/class_FileInputStreamer.php index e13174a..75dc429 100644 --- a/inc/classes/interfaces/io/file/class_FileInputStreamer.php +++ b/inc/classes/interfaces/io/file/class_FileInputStreamer.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface FileInputStreamer extends Streamable { /** diff --git a/inc/classes/interfaces/io/file/class_FileOutputStreamer.php b/inc/classes/interfaces/io/file/class_FileOutputStreamer.php index e0f55e4..a3f896d 100644 --- a/inc/classes/interfaces/io/file/class_FileOutputStreamer.php +++ b/inc/classes/interfaces/io/file/class_FileOutputStreamer.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface FileOutputStreamer extends Streamable { /** diff --git a/inc/classes/interfaces/io/output/class_OutputStreamer.php b/inc/classes/interfaces/io/output/class_OutputStreamer.php index a803a46..992f504 100644 --- a/inc/classes/interfaces/io/output/class_OutputStreamer.php +++ b/inc/classes/interfaces/io/output/class_OutputStreamer.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface OutputStreamer extends Streamable { /** diff --git a/inc/classes/interfaces/language/class_ManageableLanguage.php b/inc/classes/interfaces/language/class_ManageableLanguage.php index 9ffec52..7e3c0fb 100644 --- a/inc/classes/interfaces/language/class_ManageableLanguage.php +++ b/inc/classes/interfaces/language/class_ManageableLanguage.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ManageableLanguage extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/request/class_Requestable.php b/inc/classes/interfaces/request/class_Requestable.php index 7ef0f9a..0571e00 100644 --- a/inc/classes/interfaces/request/class_Requestable.php +++ b/inc/classes/interfaces/request/class_Requestable.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Requestable extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/response/class_Responseable.php b/inc/classes/interfaces/response/class_Responseable.php index 22ee2cb..f83e7f9 100644 --- a/inc/classes/interfaces/response/class_Responseable.php +++ b/inc/classes/interfaces/response/class_Responseable.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface Responseable extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/template/class_CompileableTemplate.php b/inc/classes/interfaces/template/class_CompileableTemplate.php index f6dc577..0bf7556 100644 --- a/inc/classes/interfaces/template/class_CompileableTemplate.php +++ b/inc/classes/interfaces/template/class_CompileableTemplate.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface CompileableTemplate extends FrameworkInterface { /** diff --git a/inc/classes/interfaces/template/view/class_ViewHelper.php b/inc/classes/interfaces/template/view/class_ViewHelper.php index 1de45ff..36c0dde 100644 --- a/inc/classes/interfaces/template/view/class_ViewHelper.php +++ b/inc/classes/interfaces/template/view/class_ViewHelper.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ interface ViewHelper extends FrameworkInterface { /** diff --git a/inc/classes/main/class_ b/inc/classes/main/class_ index 1701d1d..26ff8be 100644 --- a/inc/classes/main/class_ +++ b/inc/classes/main/class_ @@ -27,9 +27,9 @@ class extends BaseFrameworkSystem { * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription(""); diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index f053ac3..796860a 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -167,9 +167,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { * * @return void */ - private function __construct ($class) { + protected function __construct ($class) { // Set real class $this->setRealClass($class); + + // Init this instance + $this->initInstance($class); } /** @@ -220,14 +223,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Public constructor (for initializing things, etc.) + * Initializes the instance * * @return void */ - public function constructor ($class) { - // Call constructor - $this->__construct($class); - + public function initInstance ($class) { // Get the current (singleton) configuration instance $this->setConfigInstance(FrameworkConfiguration::createFrameworkConfiguration()); @@ -287,12 +287,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Setter for language instance * - * @param $configInstance The configuration instance which shall + * @param $configInstance The configuration instance which shall * be FrameworkConfiguration * @return void */ public final function setConfigInstance (FrameworkConfiguration $configInstance) { - $this->cfgInstance = $configInstance; + self::$cfgInstance = $configInstance; if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Konfigurations-Handler auf %s gesetzt.
\n", $this->__toString(), $configInstance->__toString() @@ -307,9 +307,9 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { public final function getConfigInstance () { if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Konfigurations-Handler %s angefordert.
\n", $this->__toString(), - $this->cfgInstance->__toString() + self::$cfgInstance->__toString() )); - return $this->cfgInstance; + return self::$cfgInstance; } /** diff --git a/inc/classes/main/class_FrameworkArrayObject.php b/inc/classes/main/class_FrameworkArrayObject.php index 06c6be6..69a3363 100644 --- a/inc/classes/main/class_FrameworkArrayObject.php +++ b/inc/classes/main/class_FrameworkArrayObject.php @@ -24,16 +24,6 @@ * along with this program. If not, see . */ class FrameworkArrayObject extends ArrayObject { - /** - * Constructor for smooth coding style ;-) - * - * @param $class The class's real name - * @return void - */ - public function constructor ($class) { - // $class will be ignored for backward compatiblity - } - /** * Get real class' name back * diff --git a/inc/classes/main/commands/class_BaseCommand.php b/inc/classes/main/commands/class_BaseCommand.php index 69a3f79..501c1ff 100644 --- a/inc/classes/main/commands/class_BaseCommand.php +++ b/inc/classes/main/commands/class_BaseCommand.php @@ -23,23 +23,13 @@ */ class BaseCommand extends BaseFrameworkSystem { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); - } - - /** - * Constructor for smooth coding style ;-) - * - * @param $class The class's real name - * @return void - */ - public function constructor ($class) { - $this->__construct($class); + parent::__construct($class); } } diff --git a/inc/classes/main/commands/extended/class_ b/inc/classes/main/commands/extended/class_ index b718936..e4fc443 100644 --- a/inc/classes/main/commands/extended/class_ +++ b/inc/classes/main/commands/extended/class_ @@ -27,9 +27,9 @@ class Command extends BaseCommand implements Commandable { * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set special description $this->setObjectDescription("Spezieller Command"); diff --git a/inc/classes/main/compressor/class_Bzip2Compressor.php b/inc/classes/main/compressor/class_Bzip2Compressor.php index a05da30..2cadc80 100644 --- a/inc/classes/main/compressor/class_Bzip2Compressor.php +++ b/inc/classes/main/compressor/class_Bzip2Compressor.php @@ -23,13 +23,13 @@ */ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor! - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php index 2d07bcb..ae59267 100644 --- a/inc/classes/main/compressor/class_GzipCompressor.php +++ b/inc/classes/main/compressor/class_GzipCompressor.php @@ -23,13 +23,13 @@ */ class GzipCompressor extends BaseFrameworkSystem implements Compressor { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor! - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", diff --git a/inc/classes/main/compressor/class_NullCompressor.php b/inc/classes/main/compressor/class_NullCompressor.php index 2f17433..742ab02 100644 --- a/inc/classes/main/compressor/class_NullCompressor.php +++ b/inc/classes/main/compressor/class_NullCompressor.php @@ -23,13 +23,13 @@ */ class NullCompressor extends BaseFrameworkSystem implements Compressor { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor! - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php index 367fa80..3e9e9d7 100644 --- a/inc/classes/main/console/class_ConsoleTools.php +++ b/inc/classes/main/console/class_ConsoleTools.php @@ -23,13 +23,13 @@ */ class ConsoleTools extends BaseFrameworkSystem { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Console-Tools"); diff --git a/inc/classes/main/controller/class_BaseController.php b/inc/classes/main/controller/class_BaseController.php index 4022a77..82dba69 100644 --- a/inc/classes/main/controller/class_BaseController.php +++ b/inc/classes/main/controller/class_BaseController.php @@ -23,27 +23,17 @@ */ class BaseController extends BaseFrameworkSystem { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Clean up a little $this->removeNumberFormaters(); } - - /** - * The public constructor - * - * @return void - */ - public function constructor ($class) { - // Calls just the private one - $this->__construct($class); - } } // [EOF] diff --git a/inc/classes/main/database/class_BaseDatabaseFrontend.php b/inc/classes/main/database/class_BaseDatabaseFrontend.php index 7d25170..a4220e0 100644 --- a/inc/classes/main/database/class_BaseDatabaseFrontend.php +++ b/inc/classes/main/database/class_BaseDatabaseFrontend.php @@ -29,13 +29,13 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem implements Datab private $limitInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct($class) { + protected function __construct($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Debug message if (((defined('DEBUG_DATABASE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.
\n", @@ -46,16 +46,6 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem implements Datab $this->removeNumberFormaters(); } - /** - * The public constructor - * - * @return void - */ - public function constructor ($class) { - // Calls just the private one - $this->__construct($class); - } - /** * Getter for limitation instance * diff --git a/inc/classes/main/database/classes/class_LocalFileDatabase.php b/inc/classes/main/database/classes/class_LocalFileDatabase.php index 8530dbd..3748108 100644 --- a/inc/classes/main/database/classes/class_LocalFileDatabase.php +++ b/inc/classes/main/database/classes/class_LocalFileDatabase.php @@ -50,9 +50,9 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend * * @return void */ - private function __construct() { + protected function __construct() { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Dateidatenbankschicht"); diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php index ba5c065..a019c3f 100644 --- a/inc/classes/main/debug/class_DebugConsoleOutput.php +++ b/inc/classes/main/debug/class_DebugConsoleOutput.php @@ -23,13 +23,13 @@ */ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Debug-Ausgabe auf Konsole"); diff --git a/inc/classes/main/debug/class_DebugErrorLogOutput.php b/inc/classes/main/debug/class_DebugErrorLogOutput.php index 75194c9..a26867b 100644 --- a/inc/classes/main/debug/class_DebugErrorLogOutput.php +++ b/inc/classes/main/debug/class_DebugErrorLogOutput.php @@ -23,13 +23,13 @@ */ class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Debug-Ausgabe in error_log()"); diff --git a/inc/classes/main/debug/class_DebugWebOutput.php b/inc/classes/main/debug/class_DebugWebOutput.php index c0b26e6..a7ed41d 100644 --- a/inc/classes/main/debug/class_DebugWebOutput.php +++ b/inc/classes/main/debug/class_DebugWebOutput.php @@ -23,13 +23,13 @@ */ class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Debug-Ausgabe auf Konsole"); diff --git a/inc/classes/main/extended/class_ObjectLimits.php b/inc/classes/main/extended/class_ObjectLimits.php index 880928d..a2eccc3 100644 --- a/inc/classes/main/extended/class_ObjectLimits.php +++ b/inc/classes/main/extended/class_ObjectLimits.php @@ -30,13 +30,13 @@ class ObjectLimits extends BaseFrameworkSystem { private $limitArray = null; /** - * Private constructor + * Protected constructor * * @return void */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Limitierungsobjekt"); diff --git a/inc/classes/main/extended/class_SerializationContainer.php b/inc/classes/main/extended/class_SerializationContainer.php index f78c72e..94da00b 100644 --- a/inc/classes/main/extended/class_SerializationContainer.php +++ b/inc/classes/main/extended/class_SerializationContainer.php @@ -30,7 +30,7 @@ class SerializationContainer extends FrameworkArrayObject { */ public function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Debug message if ((defined('DEBUG_CONTAINER')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[SerializationContainer:] Konstruktor erreicht.
\n"); diff --git a/inc/classes/main/io/class_FileIOStream.php b/inc/classes/main/io/class_FileIOStream.php index 92351dd..39acf09 100644 --- a/inc/classes/main/io/class_FileIOStream.php +++ b/inc/classes/main/io/class_FileIOStream.php @@ -23,11 +23,11 @@ */ class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, FileOutputStreamer { /** - * Private constructor + * Protected constructor */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Universal Datei-Ein-/Ausgabesystem"); diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php index 5610d14..553e633 100644 --- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php +++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php @@ -33,11 +33,11 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem { private $dirPointer = null; /** - * Private constructor + * Protected constructor */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Verzeichnis-Handler"); diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php index 56e3488..3834de9 100644 --- a/inc/classes/main/io/class_FrameworkFileInputPointer.php +++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php @@ -33,11 +33,11 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem { private $filePointer = null; /** - * Private constructor + * Protected constructor */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Dateiausgabe-Handler"); diff --git a/inc/classes/main/io/class_FrameworkFileOutputPointer.php b/inc/classes/main/io/class_FrameworkFileOutputPointer.php index f3d911a..cf7f491 100644 --- a/inc/classes/main/io/class_FrameworkFileOutputPointer.php +++ b/inc/classes/main/io/class_FrameworkFileOutputPointer.php @@ -33,11 +33,11 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem { private $filePointer = null; /** - * Private constructor + * Protected constructor */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Dateiausgabe-Handler"); diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php index 12ce655..1ed28e4 100644 --- a/inc/classes/main/language/class_LanguageSystem.php +++ b/inc/classes/main/language/class_LanguageSystem.php @@ -44,13 +44,13 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage { private static $thisInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Sprachsystem"); diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php index fc4d750..7bd0588 100644 --- a/inc/classes/main/output/class_ConsoleOutput.php +++ b/inc/classes/main/output/class_ConsoleOutput.php @@ -34,13 +34,13 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer { private $vars = array(); /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Console-Ausgabe-Handler"); diff --git a/inc/classes/main/output/class_WebOutput.php b/inc/classes/main/output/class_WebOutput.php index 8f17649..1312f33 100644 --- a/inc/classes/main/output/class_WebOutput.php +++ b/inc/classes/main/output/class_WebOutput.php @@ -29,13 +29,13 @@ class WebOutput extends BaseFrameworkSystem implements OutputStreamer { private static $webInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Web-Ausgabe-Handler"); diff --git a/inc/classes/main/request/class_HttpRequest.php b/inc/classes/main/request/class_HttpRequest.php index 635b0fd..ca85b97 100644 --- a/inc/classes/main/request/class_HttpRequest.php +++ b/inc/classes/main/request/class_HttpRequest.php @@ -28,13 +28,13 @@ class HttpRequest extends BaseFrameworkSystem implements Requestable { private $requestData = array(); /** - * Private constructor + * Protected constructor * * @return void */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("HTTP-Anfrage"); diff --git a/inc/classes/main/response/class_HttpResponse.php b/inc/classes/main/response/class_HttpResponse.php index 04cb16f..8b29afe 100644 --- a/inc/classes/main/response/class_HttpResponse.php +++ b/inc/classes/main/response/class_HttpResponse.php @@ -38,13 +38,13 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable { private $responseBody = ""; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("HTTP-Antwort"); diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php index a8479dd..4fdb1a3 100644 --- a/inc/classes/main/template/class_TemplateEngine.php +++ b/inc/classes/main/template/class_TemplateEngine.php @@ -114,13 +114,13 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate const EXCEPTION_INVALID_VIEW_HELPER = 0xa02; /** - * Private constructor + * Protected constructor * * @return void */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set part description $this->setObjectDescription("Template-Engine"); diff --git a/inc/classes/middleware/class_BaseMiddleware.php b/inc/classes/middleware/class_BaseMiddleware.php index 88bc16e..9b576dd 100644 --- a/inc/classes/middleware/class_BaseMiddleware.php +++ b/inc/classes/middleware/class_BaseMiddleware.php @@ -19,31 +19,21 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class BaseMiddleware extends BaseFrameworkSystem { /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct ($class) { + protected function __construct ($class) { // Call parent constructor - parent::constructor($class); + parent::__construct($class); // Clean up a little $this->removeNumberFormaters(); } - - /** - * Public constructor - * - * @return void - */ - public function constructor ($class) { - // Just call the private constructor - $this->__construct($class); - } } // [EOF] diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php index 8dae607..da8b484 100644 --- a/inc/classes/middleware/compressor/class_CompressorChannel.php +++ b/inc/classes/middleware/compressor/class_CompressorChannel.php @@ -19,16 +19,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class CompressorChannel extends BaseMiddleware { // Output handler instance private $compressor = null; // Public constructor - private function __construct () { + protected function __construct () { // Call parent constructor! - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Komprimierungshandler"); diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php index d7db9d8..402677b 100644 --- a/inc/classes/middleware/database/class_DatabaseConnection.php +++ b/inc/classes/middleware/database/class_DatabaseConnection.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, LimitableObject { // Array for connection data @@ -31,10 +31,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Li // An instance of this class private static $thisInstance = null; - // Private constructor - private final function __construct() { + // Protected constructor + protected function __construct() { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Datenbank-Mittelschicht"); diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php index 2cc4882..4a13432 100644 --- a/inc/classes/middleware/debug/class_DebugMiddleware.php +++ b/inc/classes/middleware/debug/class_DebugMiddleware.php @@ -21,7 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class DebugMiddleware extends BaseMiddleware { /** @@ -35,13 +35,13 @@ class DebugMiddleware extends BaseMiddleware { private static $thisInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private final function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Debug-Ausgabe-Handler"); diff --git a/inc/classes/middleware/io/class_FileIOHandler.php b/inc/classes/middleware/io/class_FileIOHandler.php index 7e0d35a..fa6937c 100644 --- a/inc/classes/middleware/io/class_FileIOHandler.php +++ b/inc/classes/middleware/io/class_FileIOHandler.php @@ -20,7 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ class FileIOHandler extends BaseMiddleware { /** @@ -39,13 +39,13 @@ class FileIOHandler extends BaseMiddleware { private static $thisInstance = null; /** - * Private constructor + * Protected constructor * * @return void */ - private function __construct () { + protected function __construct () { // Call parent constructor - parent::constructor(__CLASS__); + parent::__construct(__CLASS__); // Set description $this->setObjectDescription("Datei-Ein-/Ausgabe-Handler"); diff --git a/inc/config.php b/inc/config.php index ab944bf..e104b41 100644 --- a/inc/config.php +++ b/inc/config.php @@ -21,7 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Load the class from inc/config direktory diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php index dd19e19..9f919fa 100644 --- a/inc/config/class_FrameworkConfiguration.php +++ b/inc/config/class_FrameworkConfiguration.php @@ -43,9 +43,9 @@ class FrameworkConfiguration { const EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND = 0xc01; /** - * Private constructor + * Protected constructor */ - private function __construct () { + protected function __construct () { // Empty for now } diff --git a/inc/database.php b/inc/database.php index a8a9fcf..bba0192 100644 --- a/inc/database.php +++ b/inc/database.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Initialize layer diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php index a689fed..3e1ebc5 100644 --- a/inc/database/lib-local.php +++ b/inc/database/lib-local.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Zum Testen speichern wir in lokale Dateien (LocalFileDatabase) diff --git a/inc/file_io.php b/inc/file_io.php index 92c96b6..eb37543 100644 --- a/inc/file_io.php +++ b/inc/file_io.php @@ -21,7 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Get the instance diff --git a/inc/includes.php b/inc/includes.php index c915858..f6aeeac 100644 --- a/inc/includes.php +++ b/inc/includes.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Include the class loader function diff --git a/inc/language.php b/inc/language.php index c806545..1711acf 100644 --- a/inc/language.php +++ b/inc/language.php @@ -18,7 +18,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ try { $lang = LanguageSystem::createLanguageSystem(sprintf("%s%s", diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index 79389f6..9d4ddbe 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . * * ---------------------------------- * 1.1 diff --git a/inc/output.php b/inc/output.php index 87e8384..b77df4a 100644 --- a/inc/output.php +++ b/inc/output.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Debug-Ausgabe vorbereiten diff --git a/inc/selector.php b/inc/selector.php index 7af8aa0..a8bb1fd 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ // Does the user has an application specified? -- 2.30.2