Method constructor() removed, several small fixes

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index 9e62fc0c27edcc73c662509374b31616ab7a96a3..3edc751089872bf0f0ad6e70b2607a92aca7cfbe 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
        /**
  */
 class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
        /**


@@ -61,16 +61,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        private static $thisInstance = null;
 
        /**
        private static $thisInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

-               $this->setPartDescr("Application-Helper");
+               $this->setObjectDescription("Application-Helper");

 
                // Create an unique ID
                $this->createUniqueID();
 
                // Create an unique ID
                $this->createUniqueID();

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index b29414a18b3e0a2d676dcd8560eeae6fb57485a0..a7f3294d1f8458615fea5befad9c3cc703cf1ed7 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ApplicationSelector extends BaseFrameworkSystem {
        /**
  */
 class ApplicationSelector extends BaseFrameworkSystem {
        /**


@@ -54,12 +54,12 @@ class ApplicationSelector extends BaseFrameworkSystem {
         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct() {
+       protected function __construct() {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

-               $this->setPartDescr("Applikationswechsler");
+               $this->setObjectDescription("Applikationswechsler");

 
                // Create unique ID number
                $this->createUniqueID();
 
                // Create unique ID number
                $this->createUniqueID();

diff --git a/application/selector/debug.php b/application/selector/debug.php
index 8046ad48d3caa134fff9c35686b4ca14225bdafb..36ad6efe624d89726ed84040438e58d12a55fed1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // [EOF]
  */
 
 // [EOF]

diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php
index ac62fc10fcc248f79e1f33dd426f47f7e1593869..dcce07549d12ad82938a9bd84c7f71c00e37629c 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Set the new handler
  */
 
 // Set the new handler

diff --git a/application/selector/init.php b/application/selector/init.php
index 98105797a2871ac7c01a1f3aad276b628c3d30df..08bd8ac29057882885b43df3516041c1c646cb43 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 //
 //
  */
 //
 //

diff --git a/application/selector/loader.php b/application/selector/loader.php
index 44dbb5c4bb3a822ef1281fa24b88e0fb09bab87e..71c44c6e55b900bc11fd333daa38e57dac50b214 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Is the application instance set?
  */
 
 // Is the application instance set?

diff --git a/application/selector/starter.php b/application/selector/starter.php
index 0833cecce231b46c07b6594d2fd074129018acdb..21d451aba661cdc4da6df074f83c95cf0768caa5 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Get the application helper instance
  */
 
 // Get the application helper instance

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index 2a3010155f0ce921f38fef0e8e41a7a1d8040add..ff8fe5e76d9e71f489330f634aa1bfa50b849a7f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
        /**
  */
 class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
        /**


@@ -61,16 +61,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        private static $thisInstance = null;
 
        /**
        private static $thisInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

-               $this->setPartDescr("Application-Helper");
+               $this->setObjectDescription("Application-Helper");

 
                // Create an unique ID
                $this->createUniqueID();
 
                // Create an unique ID
                $this->createUniqueID();

diff --git a/application/ship-simu/debug.php b/application/ship-simu/debug.php
index d9fff10599af4404841f57979f7a43b74371b881..c26ed79af61dda7b599cc2dc788357ea49c7ae0a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Reederei-Objekt debuggen
  */
 
 // Reederei-Objekt debuggen

diff --git a/application/ship-simu/exceptions.php b/application/ship-simu/exceptions.php
index 53e4b959eefe0958b9d375439d7c695842928def..0e3c80c5f5ea2b2b36a051e867d64c2b0b56ed88 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Set the new handler
  */
 
 // Set the new handler

diff --git a/application/ship-simu/exceptions/class_BirthdayInvalidException.php b/application/ship-simu/exceptions/class_BirthdayInvalidException.php
index 913a429dbabbfa8e07663bcc274389fdf7580c8a..84948f752f19340b3c20a6ced46de0edeaa2625f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BirthdayInvalidException extends FrameworkException {
        public function __construct (array $birthArray, $code) {
  */
 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 735257fcdc3069180da9f3184b59f82d06b0d350..11abaa1298a64d8990c4e2c2afd9d2936b0b5385 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class CabinShipMismatchException extends FrameworkException {
 }
  */
 class CabinShipMismatchException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_ContractAllreadySignedException.php b/application/ship-simu/exceptions/class_ContractAllreadySignedException.php
index b3f0e5ec6c24ad80c726f7b60f52895addf890be..3c11743b4c64f690b64d3d2bdc00c16d4832b3ee 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ContractAllreadySignedException extends FrameworkException {
        public function __construct (array $classArray, $code) {
  */
 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 fce9e7add8fe05e0967c79898e6c3fc2ff03d3a0..b8bdb69cd8af0c54ced244310a15e74b10384b31 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ContractPartnerMismatchException extends FrameworkException {
        public function __construct (array $classArray, $code) {
  */
 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 03e3c67b856976ecdbbec354a5602795a6001452..4c89816696ff73a793fe69f08772900eccba15ae 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DeckShipMismatchException extends FrameworkException {
 }
  */
 class DeckShipMismatchException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_EmptyStructuresListException.php b/application/ship-simu/exceptions/class_EmptyStructuresListException.php
index cd01a1e4c82b09f6656ddb1fa0237386e85bcb74..31cb6d43cee5e5b7f65ecf0cd67a04c86795ce3c 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class EmptyStructuresListException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
  */
 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 c0d0eb86f6e434cd11ec54e76de67cb0994f90c3..992e34e1bdaf94f0dec2b6c89b1a81eb2e5ad72b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidContractPartnerException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
                // Add a message around the missing class
                $message = sprintf("[%s:] <u>%s</u> ist kein g&uuml;tiger Vertragspartner.",
                        $class->__toString(),
  */
 class InvalidContractPartnerException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
                // Add a message around the missing class
                $message = sprintf("[%s:] <u>%s</u> ist kein g&uuml;tiger Vertragspartner.",
                        $class->__toString(),

-                       $class->getPartDescr()
+                       $class->getObjectDescription()

                );
 
                // Call parent constructor
                );
 
                // Call parent constructor

diff --git a/application/ship-simu/exceptions/class_InvalidIDFormatException.php b/application/ship-simu/exceptions/class_InvalidIDFormatException.php
index 295096a960129b7ea8e069c39b23b8480e13efc5..ca795ce3ba0e293c88178a67ce291242972d5068 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidIDFormatException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
  */
 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 8c125957ecc49c8e35844b08c74395d1144aafe4..f6f20e71c5155bb5559bce21f16c350c273e37ce 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ItemNotInPriceListException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
                // Add a message around the missing class
                $message = sprintf("[Merchant:] Preis f&uuml;r den Artikel <u>%s</u> <em><u>%s</u></em> nicht gefunden.",
                        $class->__toString(),
  */
 class ItemNotInPriceListException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
                // Add a message around the missing class
                $message = sprintf("[Merchant:] Preis f&uuml;r den Artikel <u>%s</u> <em><u>%s</u></em> nicht gefunden.",
                        $class->__toString(),

-                       $class->getPartDescr()
+                       $class->getObjectDescription()

                );
 
                // Call parent constructor
                );
 
                // Call parent constructor

diff --git a/application/ship-simu/exceptions/class_ItemNotTradeableException.php b/application/ship-simu/exceptions/class_ItemNotTradeableException.php
index 496e4b08c5ba6e58584a84401169f22454816d26..b4ea989f038c06f25f217b93e3d05697e62ad8e4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ItemNotTradeableException extends FrameworkException {
        public function __construct (array $classArray, $code) {
                // Add a message around the missing class
                $message = sprintf("[%s:] <u>%s</u> ist nicht handelbar!",
                        $classArray[0]->__toString(),
  */
 class ItemNotTradeableException extends FrameworkException {
        public function __construct (array $classArray, $code) {
                // Add a message around the missing class
                $message = sprintf("[%s:] <u>%s</u> ist nicht handelbar!",
                        $classArray[0]->__toString(),

-                       $classArray[1]->getPartDescr()
+                       $classArray[1]->getObjectDescription()

                );
 
                // Call parent constructor
                );
 
                // Call parent constructor

diff --git a/application/ship-simu/exceptions/class_MissingSimulatorIDException.php b/application/ship-simu/exceptions/class_MissingSimulatorIDException.php
index d66b6e5bc14ecba32137d4d23647f56fa44c988d..aafb1ab6cae074f27c01a8141244a0a40d1ddf85 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingSimulatorIDException extends FrameworkException {
        public function __construct (array $classArray, $code) {
  */
 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 a86b6cb3d3205aad71988328c43b354ec1daf8e2..8ea793da54f0bdaecb188afe0aba9a64362d347b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MotorShipMismatchException extends FrameworkException {
 }
  */
 class MotorShipMismatchException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php b/application/ship-simu/exceptions/class_NoShipyardsConstructedException.php
index ff01762db2d92c2cb50d8859bb561aaf7ab9695d..9600c57bd30046351cd700eb5c857285e7474a1b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class NoShipyardsConstructedException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
  */
 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 eeee65193e999259018769e47fcd603bfdba3368..7386231eaef188fc3cce69fdd2f29cdc36769287 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PersonellListAlreadyCreatedException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
  */
 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 8555420bcd121834d170e60259f3a2b3f72ff773..9ef36c05d78c36db8d23ccb176cc5930b8d2f9df 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class RoomShipMismatchException extends FrameworkException {
 }
  */
 class RoomShipMismatchException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_ShipNotConstructedException.php b/application/ship-simu/exceptions/class_ShipNotConstructedException.php
index 576629f1d69e3121f021bada733f182a2f804ed7..9b98d8a4756ace4c5fe1ccb8dd6510c0d864a2de 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ShipNotConstructedException extends FrameworkException {
 }
  */
 class ShipNotConstructedException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php b/application/ship-simu/exceptions/class_ShipPartNotConstructableException.php
index 7202e972394baf2162782bd15385c01d6b9eeb20..2024316b99b47ece72f3029b0c7cf0c28dd9c124 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ShipPartNotConstructableException extends FrameworkException {
        public function __construct (array $partArray, $code) {
  */
 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 73ef0c4b312b425adc14206c4db8477cd57509c9..72c094cacb3198d4ab6f0210df6d4408a92535f4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class StructureShipMismatchException extends FrameworkException {
 }
  */
 class StructureShipMismatchException extends FrameworkException {
 }

diff --git a/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php b/application/ship-simu/exceptions/class_StructuresOutOfBoundsException.php
index bd10fbc32a63e52735229ddf0231f1803578fac6..0df91726614867110b1b7e2aa622919f08529cca 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class StructuresOutOfBoundsException extends FrameworkException {
        public function __construct ($idx, $code) {
  */
 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 b25e4655785a78eb3bc9b77804dc92c0b4763cfd..633da3e45a0e4b3dd14b1cac50a49a4bc3dcfa39 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ToMuchEmployeesException extends FrameworkException {
        public function __construct ($amountArray, $code) {
  */
 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 fb11e1ba2e9105ce87308e0107f3be996a69b961..66e7f6769dfaa337c8b570d617f0556d1a18264d 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class TotalPriceNotCalculatedException extends FrameworkException {
        public function __construct (BaseFrameworkSystem $class, $code) {
  */
 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 ce02a79e14b8946fb30ebed026fd9a347ff04ef7..b46b92cc3298cb2134852ab5cb087375a2a171ed 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class UnsupportedLimitationPartException extends FrameworkException {
        public function __construct ($str, $code) {
  */
 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 d3802d473a4607d860b193d0a5deb75e153433d1..d6d0def604538a63810994be08efab481efb5e18 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class WrongGenderSpecifiedException extends FrameworkException {
        public function __construct ($gender, $code) {
  */
 class WrongGenderSpecifiedException extends FrameworkException {
        public function __construct ($gender, $code) {

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index 789420f37fb002452107c885d0b6219879748303..558c8117fbe959ebbe6732f3a60880da768d839f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Get an instance of the helper
  */
 
 // 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 8f214c76040bd69bdf3e47f0cd44a70ed1de3921..5984b0880d790a61a3c6078889aad9e8ba2c9476 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ConstructableShip extends FrameworkInterface {
 }
  */
 interface ConstructableShip extends FrameworkInterface {
 }

diff --git a/application/ship-simu/interfaces/class_ConstructableShipPart.php b/application/ship-simu/interfaces/class_ConstructableShipPart.php
index 0ca9231beb6c5334417b2bf2ac4361dd9ef4d751..76c161a664b450e06513bae424b69e6b51a0b56a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ConstructableShipPart extends FrameworkInterface {
 }
  */
 interface ConstructableShipPart extends FrameworkInterface {
 }

diff --git a/application/ship-simu/interfaces/class_ContractPartner.php b/application/ship-simu/interfaces/class_ContractPartner.php
index f36a91e8270c98286106e6289d843bafd02110c3..46075afcdf39cfaed35f25c2d5fcf482a152ef17 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ContractPartner extends FrameworkInterface {
        /**
  */
 interface ContractPartner extends FrameworkInterface {
        /**

diff --git a/application/ship-simu/interfaces/class_Customer.php b/application/ship-simu/interfaces/class_Customer.php
index aa46e01ac1525f94e104688fc504f5d69f3f6b76..613df6b3aad3a50c910a659e77ddd9bb0c0793b4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Customer extends FrameworkInterface {
        /**
  */
 interface Customer extends FrameworkInterface {
        /**

diff --git a/application/ship-simu/interfaces/class_Personellizer.php b/application/ship-simu/interfaces/class_Personellizer.php
index e528625c1d188b35c220ad7f2a80b5283f631d10..a1ee62ec9f3bc0a25f646f81d923cf39787ba983 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Personellizer extends FrameworkInterface {
                ///////////////////////
  */
 interface Personellizer extends FrameworkInterface {
                ///////////////////////

diff --git a/application/ship-simu/interfaces/class_SignableContract.php b/application/ship-simu/interfaces/class_SignableContract.php
index 8834d17ece1c4294f7590e854fec2dac7d6d5900..a4fe7aa08fee1e80eefcdcc34be6cab99e9a2d8b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface SignableContract extends FrameworkInterface {
        // Sign the contract
  */
 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 a74683885b4e3ce1d1a28018fec3d58f66368d11..c430ee07f0a5bff795cd37bef08db1d75fcee9ce 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface TradeableItem extends FrameworkInterface {
        /**
  */
 interface TradeableItem extends FrameworkInterface {
        /**

diff --git a/application/ship-simu/loader.php b/application/ship-simu/loader.php
index e44ed0fb407c3f737d3e24e126575471dba89da6..16bbaf95b4a8629e32ea1f1e0872ca7b5a8002a1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Is the application instance set?
  */
 
 // Is the application instance set?

diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php
index d77fbaa05d9ff95e78bd3ac385beef1e6e05cd14..744c160f7bd0c99505692b2d6f611d2b2e1c3dc1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        // Maximum/minimum age
  */
 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 $salary     = 0.00;
 
        // Constructor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
 
                // Set description
 
                // Debug message
                if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
 
                // Set description

-               $this->setPartDescr("Personal");
-       }
-
-       // Calls the constructor
-       public function constructor ($class) {
-               $this->__construct($class);
+               $this->setObjectDescription("Personal");

        }
 
        // Remove min/max ages
        }
 
        // Remove min/max ages

diff --git a/application/ship-simu/main/class_BaseSimulator.php b/application/ship-simu/main/class_BaseSimulator.php
index ec3fe30f342500500b6c8b66f9c16b27451f66a2..0ca7a91662427f2ac832a80e48b8a89e3e066708 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseSimulator extends BaseFrameworkSystem {
        // Schiffsteilinstanz
  */
 class BaseSimulator extends BaseFrameworkSystem {
        // Schiffsteilinstanz


@@ -42,16 +42,16 @@ class BaseSimulator extends BaseFrameworkSystem {
        );
 
        // Konstruktor
        );
 
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call highest constructor
                // Call highest constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                if ((defined('DEBUG_CORE')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",
                        $this->__toString()
                ));
 
                // Set part description and class name
 
                if ((defined('DEBUG_CORE')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\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();
 
                // Clean up a little, dies sollte ganz zum Schluss erfolgen!
                $this->removeResizeFactorArray();


@@ -59,28 +59,6 @@ class BaseSimulator extends BaseFrameworkSystem {
                $this->removeCurrShip();
        }
 
                $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 <strong>%s</strong> in class.<br />\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 <strong>%s</strong> from class.<br />\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:] <strong>%dm</strong> L&auml;nge gesetzt.<br />\n",
        // Setter-Methode fuer Laenge
        public final function setLength ($length) {
                if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] <strong>%dm</strong> L&auml;nge gesetzt.<br />\n",


@@ -177,7 +155,7 @@ class BaseSimulator extends BaseFrameworkSystem {
 
                if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Maschinenraum mit Motor <strong>%s</strong> wird fuer das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        $this->__toString(),
 
                if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Maschinenraum mit Motor <strong>%s</strong> wird fuer das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        $this->__toString(),

-                       $this->getCurrPart()->getPartDescr(),
+                       $this->getCurrPart()->getObjectDescription(),

                        $this->currShip->getShipName()
                ));
 
                        $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 <strong>%s</strong> vom Typ <strong>%s</strong> passt in das Schiff <strong>%s</strong> hinein.<br />\n",
                                $this->__toString(),
                        // Berechnungen fuer umliegendes Objekt anpassen
                        if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Das Schiffsteil <strong>%s</strong> vom Typ <strong>%s</strong> passt in das Schiff <strong>%s</strong> hinein.<br />\n",
                                $this->__toString(),

-                               $this->getCurrPart()->getPartDescr(),
+                               $this->getCurrPart()->getObjectDescription(),

                                $this->getCurrPart()->__toString(),
                                $this->currShip->getShipName()
                        ));
                                $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 <strong>%s</strong> passt in das Schiff <strong>%s</strong> hinein.<br />\n",
                                                $this->__toString(),
                                        // Das passt auch, dann Werte setzen und Motor-Instanz merken
                                        if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Das Schiffsteil <strong>%s</strong> passt in das Schiff <strong>%s</strong> hinein.<br />\n",
                                                $this->__toString(),

-                                               $this->getPartDescr(),
+                                               $this->getObjectDescription(),

                                                $this->currShip->getShipName()
                                        ));
                                        $this->setWidth($this->newWidth);
                                                $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 <strong>%s</strong> vom Typ <strong>%s</strong> ist zu gross f&uuml;r das Schiff!",
                                                $this->getCurrPart()->__toString(),
                                        // Passt nicht! Also wieder Exception werfen...
                                        throw new StructureShipMismatchException(sprintf("[%s:] Das Schiffsteil <strong>%s</strong> vom Typ <strong>%s</strong> ist zu gross f&uuml;r das Schiff!",
                                                $this->getCurrPart()->__toString(),

-                                               $this->getCurrPart()->getPartDescr(),
+                                               $this->getCurrPart()->getObjectDescription(),

                                                $this->getCurrPart()->__toString()
                                        ), 2);
                                }
                                                $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 <strong>%s</strong> gefunden.<br />\n",
                                        $this->getCurrPart()->realClass,
                                // Debug-Meldung ausgeben
                                if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] Schiffsteil <strong>%s</strong> gefunden.<br />\n",
                                        $this->getCurrPart()->realClass,

-                                       $this->getCurrPart()->getPartDescr()
+                                       $this->getCurrPart()->getObjectDescription()

                                ));
 
                                // Schiffsteil-Instanz setzen
                                ));
 
                                // Schiffsteil-Instanz setzen


@@ -248,7 +226,7 @@ class BaseSimulator extends BaseFrameworkSystem {
                        // Exception werfen!
                        throw new StructureShipMismatchException(sprintf("[%s:] Das Schiffsteil <u>%s</u> vom Typ <u>%s</u> passt nicht in das Schiff!",
                                $this->getCurrPart()->realClass,
                        // Exception werfen!
                        throw new StructureShipMismatchException(sprintf("[%s:] Das Schiffsteil <u>%s</u> vom Typ <u>%s</u> passt nicht in das Schiff!",
                                $this->getCurrPart()->realClass,

-                               $this->getCurrPart()->getPartDescr(),
+                               $this->getCurrPart()->getObjectDescription(),

                                $this->getCurrPart()->__toString()
                        ), 1);
                }
                                $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&uuml;r <strong>%s</strong>.<br />\n",
                        $this->__toString(),
        public function extractDimensions ($dim) {
                if (defined('DEBUG_CORE')) $this->getDebugInstance()->output(sprintf("[%s:] extractDimensions erreicht f&uuml;r <strong>%s</strong>.<br />\n",
                        $this->__toString(),

-                       $this->getPartDescr()
+                       $this->getObjectDescription()

                ));
 
                // Abmasse setzen
                ));
 
                // Abmasse setzen

diff --git a/application/ship-simu/main/class_Merchant.php b/application/ship-simu/main/class_Merchant.php
index c40f23678dd6ab69c9270b98a19bdfc34bf001df..ce657135918dda52f1bcd184d39daae0c801c6c5 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Merchant extends BaseFrameworkSystem {
        // Name des Haendlers
  */
 class Merchant extends BaseFrameworkSystem {
        // Name des Haendlers


@@ -32,9 +32,9 @@ class Merchant extends BaseFrameworkSystem {
        private $harborInstance = null;
 
        // Konstruktor
        private $harborInstance = null;
 
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_MERCHANT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -45,7 +45,7 @@ class Merchant extends BaseFrameworkSystem {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("H&auml;ndler");
+               $this->setObjectDescription("H&auml;ndler");

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // Generate unique ID number
                $this->createUniqueID();


@@ -152,7 +152,7 @@ class Merchant extends BaseFrameworkSystem {
                        __LINE__,
                        $this->getMerchantName(),
                        $itemInstance->__toString(),
                        __LINE__,
                        $this->getMerchantName(),
                        $itemInstance->__toString(),

-                       $itemInstance->getPartDescr(),
+                       $itemInstance->getObjectDescription(),

                        $this->formatCurrency($price)
                ));
 
                        $this->formatCurrency($price)
                ));
 

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index aaa597fdb1ee6ac3cc67a4fa18cd0f0fa192b782..96f1bcaf0b2087b7694a5631c15ce5b455648fc6 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class WorksContract extends BaseFrameworkSystem implements SignableContract {
        // Zukuenftiger Schiffsname
  */
 class WorksContract extends BaseFrameworkSystem implements SignableContract {
        // Zukuenftiger Schiffsname


@@ -41,9 +41,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
        private $merchantInstance = null;
 
        // Konstruktor
        private $merchantInstance = null;
 
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -54,7 +54,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("Bauvertrag");
+               $this->setObjectDescription("Bauvertrag");

 
                // Unique-ID generieren
                $this->createUniqueID();
 
                // Unique-ID generieren
                $this->createUniqueID();


@@ -89,7 +89,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                        __CLASS__,
                        __LINE__,
                        $shipName,
                        __CLASS__,
                        __LINE__,
                        $shipName,

-                       $partnerInstance->getPartDescr(),
+                       $partnerInstance->getObjectDescription(),

                        $partnerInstance->getCompanyName()
                ));
 
                        $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] <strong>%s</strong> kostet <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> kostet <strong>%s</strong>.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $instance->getPartDescr(),
+                       $instance->getObjectDescription(),

                        $this->getMerchantInstance()->formatCurrency($price)
                ));
 
                        $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] <strong>%s</strong> wurde in den Bauvertrag aufgenommen.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_CONTRACT')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> wurde in den Bauvertrag aufgenommen.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $instance->getPartDescr()
+                       $instance->getObjectDescription()

                ));
        }
 
                ));
        }
 


@@ -334,9 +334,9 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> stimmt einem Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> zu.<br />\n",
                                        __CLASS__,
                                        __LINE__,
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> stimmt einem Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> zu.<br />\n",
                                        __CLASS__,
                                        __LINE__,

-                                       $partnerInstance->getPartDescr(),
+                                       $partnerInstance->getObjectDescription(),

                                        $partnerInstance->getCompanyName(),
                                        $partnerInstance->getCompanyName(),

-                                       $this->getShipInstance()->getPartDescr(),
+                                       $this->getShipInstance()->getObjectDescription(),

                                        $this->getShipInstance()->getShipName()
                                ));
                        } else {
                                        $this->getShipInstance()->getShipName()
                                ));
                        } else {


@@ -344,11 +344,11 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> geht mit der <strong>%s</strong> <em><strong>%s</strong></em> einen Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> ein.<br />\n",
                                        __CLASS__,
                                        __LINE__,
                                $this->getDebugInstance()->output(sprintf("[%s:%d] Die <strong>%s</strong> <em><strong>%s</strong></em> geht mit der <strong>%s</strong> <em><strong>%s</strong></em> einen Bauvertrag &uuml;ber das <strong>%s</strong> <em><strong>%s</strong></em> ein.<br />\n",
                                        __CLASS__,
                                        __LINE__,

-                                       $partnerInstance->getPartDescr(),
+                                       $partnerInstance->getObjectDescription(),

                                        $partnerInstance->getCompanyName(),
                                        $partnerInstance->getCompanyName(),

-                                       $partyInstance->getPartDescr(),
+                                       $partyInstance->getObjectDescription(),

                                        $partyInstance->getCompanyName(),
                                        $partyInstance->getCompanyName(),

-                                       $this->getShipInstance()->getPartDescr(),
+                                       $this->getShipInstance()->getObjectDescription(),

                                        $this->getShipInstance()->getShipName()
                                ));
                        }
                                        $this->getShipInstance()->getShipName()
                                ));
                        }

diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php
index d8c042550b275b9e701d0ad5b0b1c9ee0f1175b5..b93efdb8efc1804cf880bf4866a5ba1aa8414d16 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ShippingCompany extends BaseSimulator implements Customer, ContractPartner {
        /**
  */
 class ShippingCompany extends BaseSimulator implements Customer, ContractPartner {
        /**


@@ -67,9 +67,9 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_COMPANY')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // 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
                }
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // Generate unique ID number
                $this->createUniqueID();


@@ -229,7 +229,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        $employeeInstance->getSurname(),
                        $employeeInstance->getFamily(),
                        $this->getCompanyName(),
                        $employeeInstance->getSurname(),
                        $employeeInstance->getFamily(),
                        $this->getCompanyName(),

-                       $employeeInstance->getPartDescr(),
+                       $employeeInstance->getObjectDescription(),

                        $this->formatCurrency($employeeInstance->getSalary())
                ));
                $this->employeeList->append($employeeInstance);
                        $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);
 
                        // 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?
 
                        $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(),
                        __CLASS__,
                        __LINE__,
                        $this->getCompanyName(),

-                       $shipInstance->getPartDescr()
+                       $shipInstance->getObjectDescription()

                ));
 
                // Iterate shipyard list
                ));
 
                // Iterate shipyard list


@@ -503,7 +503,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        __LINE__,
                        $this->getCompanyName(),
                        $contractInstance->getShipName(),
                        __LINE__,
                        $this->getCompanyName(),
                        $contractInstance->getShipName(),

-                       $shipInstance->getPartDescr()
+                       $shipInstance->getObjectDescription()

                ));
 
                // Now check if the ship type is in any list and return the result
                ));
 
                // 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(),
                        __CLASS__,
                        __LINE__,
                        $this->getCompanyName(),

-                       $contractInstance->getShipInstance()->getPartDescr(),
+                       $contractInstance->getShipInstance()->getObjectDescription(),

                        $contractInstance->getShipInstance()->getShipName()
                ));
                $this->contractList->append($contractInstance);
                        $contractInstance->getShipInstance()->getShipName()
                ));
                $this->contractList->append($contractInstance);


@@ -606,7 +606,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                __CLASS__,
                                __LINE__,
                                $this->getCompanyName(),
                                __CLASS__,
                                __LINE__,
                                $this->getCompanyName(),

-                               $contractInstance->getShipInstance()->getPartDescr(),
+                               $contractInstance->getShipInstance()->getObjectDescription(),

                                $contractInstance->getShipInstance()->getShipName()
                        ));
                } else {
                                $contractInstance->getShipInstance()->getShipName()
                        ));
                } else {


@@ -615,7 +615,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                __CLASS__,
                                __LINE__,
                                $this->getCompanyName(),
                                __CLASS__,
                                __LINE__,
                                $this->getCompanyName(),

-                               $contractInstance->getShipInstance()->getPartDescr(),
+                               $contractInstance->getShipInstance()->getObjectDescription(),

                                $contractInstance->getShipInstance()->getShipName(),
                                $partnerInstance->getCompanyName()
                        ));
                                $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 b802608ae172a3c545659fcb2c43e2bd88a7a0a3..b8bd26c690c6fe09f9f2e46f91cab4b65dbbf00f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Berth extends BaseConstruction {
        // Durchlaufende Nummer der Liegeplaetze
  */
 class Berth extends BaseConstruction {
        // Durchlaufende Nummer der Liegeplaetze


@@ -29,7 +29,7 @@ class Berth extends BaseConstruction {
        private $harborInstance = null;
 
        // Konstruktor
        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.<br />\n",
                                __CLASS__,
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
                        $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
                                __CLASS__,


@@ -38,10 +38,10 @@ class Berth extends BaseConstruction {
                }
 
                // Call parent constructor
                }
 
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 d97f279f8fd124610e1547ba5fccb432939e5579..24beeddd4b8ff9d5ed755db8b90e42942b1b7c49 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseConstruction extends BaseSimulator {
        // Tiefgang fuer z.B. Trockdocks
        private $draught = 0;
 
        // Konstruktor
  */
 class BaseConstruction extends BaseSimulator {
        // Tiefgang fuer z.B. Trockdocks
        private $draught = 0;
 
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Eltern-Konstrutor aufrufen
                // 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.<br />\n",
 
                // Debug message
                if ((defined('DEBUG_CORE')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",


@@ -36,21 +36,11 @@ class BaseConstruction extends BaseSimulator {
                ));
 
                // Set description
                ));
 
                // Set description

-               $this->setPartDescr("Namenlose Landkonstruktion");
+               $this->setObjectDescription("Namenlose Landkonstruktion");

 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
                // 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]
 }
 
 // [EOF]

diff --git a/application/ship-simu/main/constructions/docks/class_DryDock.php b/application/ship-simu/main/constructions/docks/class_DryDock.php
index e94512849688a63bfaa58147982e8e156bb043a7..879786d2f873a713ac9560edc0a179d1112e1c0b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DryDock extends BaseConstruction {
        // Zugewiesener Hafen
        private $harborInstance = null;
 
        // Konstruktor
  */
 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.<br />\n");
 
                // Call parent constructor
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[DryDock:] Konstruktor erreicht.<br />\n");
 
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 7c1ce55c1f8e0aa2a3630be356f9e22887798df4..e414118b714c4811de8f38a208469c5ad252a447 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Harbor extends BaseConstruction {
        // Namen des Hafens (z.B. Hamburger Hafen)
  */
 class Harbor extends BaseConstruction {
        // Namen des Hafens (z.B. Hamburger Hafen)


@@ -35,15 +35,15 @@ class Harbor extends BaseConstruction {
        private $shipyardList = null;
 
        // Constructor
        private $shipyardList = null;
 
        // Constructor

-       private function __construct () {
+       protected function __construct () {

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

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 aa38ee739acf709d5d0ab5de85e1026ba5a6a849..6ec76c22584cb7be5ff0b22090c3ca46f6f35262 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Terminal extends BaseConstruction {
        // Zugewiesener Hafen
        private $harborInstance = null;
 
        // Konstruktor
  */
 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.<br />\n",
                                __CLASS__,
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
                        $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
                                __CLASS__,


@@ -35,10 +35,10 @@ class Terminal extends BaseConstruction {
                }
 
                // Call parent constructor
                }
 
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
 
                // Set description

-               $this->setPartDescr("Anlegebr&uuml;cke");
+               $this->setObjectDescription("Anlegebr&uuml;cke");

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 18a018e4ed53b6a1a6ce8be8a942fcfb57e872a0..29084843a2294ceb728f2a2e011ff9787e42839b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Shipyard extends BaseConstruction {
        // Werft-Name
  */
 class Shipyard extends BaseConstruction {
        // Werft-Name


@@ -45,9 +45,9 @@ class Shipyard extends BaseConstruction {
        private $shippingCompany = null;
 
        // Constructor
        private $shippingCompany = null;
 
        // Constructor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -58,7 +58,7 @@ class Shipyard extends BaseConstruction {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("Werft");
+               $this->setObjectDescription("Werft");

 
                // Staff-Liste/Schiffstyp-Liste erzeugen
                $this->createStaffList();
 
                // 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 a8ed3381a7ed24108c2dade300bd3b1ec54ee567..9e74079a7e17ebde3006fbc93b00483945aca905 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseDrive extends BaseSimulator {
        // Price of this drive
  */
 class BaseDrive extends BaseSimulator {
        // Price of this drive


@@ -30,9 +30,9 @@ class BaseDrive extends BaseSimulator {
        private $numCams    = 0;
 
        // Konstruktor
        private $numCams    = 0;
 
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -43,23 +43,13 @@ class BaseDrive extends BaseSimulator {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("Namenloser Antrieb");
+               $this->setObjectDescription("Namenloser Antrieb");

 
                // Clean up a little
                $this->removeNumberFormaters();
                $this->removePartInstance();
        }
 
 
                // 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 <strong>%d</strong> PS gesetzt.<br />\n",
        // 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 <strong>%d</strong> PS gesetzt.<br />\n",

diff --git a/application/ship-simu/main/drives/motor/class_Motor.php b/application/ship-simu/main/drives/motor/class_Motor.php
index 9e347a849a38ada7bab07e29a8da16afdaae9bb4..699c7219d5a89037c3cd2a723036ef4aee70f92b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart {
        // Constructor
  */
 class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart {
        // Constructor

-       private function __construct() {
+       protected function __construct() {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_DRIVE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // 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
                }
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // Generate unique ID number
                $this->createUniqueID();


@@ -58,7 +58,7 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart {
                ));
 
                // Beschreibung und Abmasse setzen
                ));
 
                // Beschreibung und Abmasse setzen

-               $motorInstance->setPartDescr($descr);
+               $motorInstance->setObjectDescription($descr);

                $motorInstance->setWidth($w);
                $motorInstance->setHeight($h);
                $motorInstance->setLength($l);
                $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 9bb8b6e038572be8bff951f8e708ff0718787fe1..9f2061775b711e92bf1f9fe815fd052a918647b3 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseShipPart extends BaseSimulator {
        // Price of this ship part
        private $price = 0.00;
 
        // Konstruktor
  */
 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
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_SHIPPART')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_SHIPPART')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -39,22 +39,12 @@ class BaseShipPart extends BaseSimulator {
                }
 
                // Beschreibung
                }
 
                // Beschreibung

-               $this->setPartDescr("Schiffsteil");
+               $this->setObjectDescription("Schiffsteil");

 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
 
                // 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;
        // 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 c89a0a03bd27d49fe06f5d6dd9b568ecbf1225fb..fdde3262b25f5be2f6bfffdb90edaa4083fcbc9a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MaschineRoom extends BaseShipPart {
        // Constructor
  */
 class MaschineRoom extends BaseShipPart {
        // Constructor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -36,7 +36,7 @@ class MaschineRoom extends BaseShipPart {
                }
 
                // Set description
                }
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 1d148ddb69d85809946e214177370e006cf6ea8a..d5aa01e4c26329227d7df4d3b5485370b92b0191 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class SimulatorPersonell extends BasePersonell {
        // Personell list
  */
 class SimulatorPersonell extends BasePersonell {
        // Personell list


@@ -32,20 +32,20 @@ class SimulatorPersonell extends BasePersonell {
        private $cacheCond = null;
 
        /**
        private $cacheCond = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
                        $this->__toString()
                ));
 
                // Set description
 
                if (((defined('DEBUG_PERSONELL')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",
                        $this->__toString()
                ));
 
                // Set description

-               $this->setPartDescr("Simulationspersonal");
+               $this->setObjectDescription("Simulationspersonal");

 
                // Create unique ID
                $this->createUniqueID();
 
                // 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 ae73132da98c3da3cd41ed5b5c820c4d90291f0d..b97f70c7d6e75e0e38ea910040ea0287729d5269 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class CompanyEmployee extends SimulatorPersonell {
        // Employeee list
        private $employeeList = null;
 
        // Constructor
  */
 class CompanyEmployee extends SimulatorPersonell {
        // Employeee list
        private $employeeList = null;
 
        // Constructor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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'))) {
 
                // 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
                }
 
                // Set description

-               $this->setPartDescr("Firmenangestellte(r)");
+               $this->setObjectDescription("Firmenangestellte(r)");

 
                // Create unique ID
                $this->createUniqueID();
 
                // 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 c4a548b3f8908a66198e26d4fa3ad45a021170b1..d4ffee9871458b9ce53bb30868ed38f9f35dfd2b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseShip extends BaseSimulator {
        // Name des Shipes
  */
 class BaseShip extends BaseSimulator {
        // Name des Shipes


@@ -38,9 +38,9 @@ class BaseShip extends BaseSimulator {
        private $structures = null;
 
        // Namenloses Ship generieren
        private $structures = null;
 
        // Namenloses Ship generieren

-       private function __construct($class) {
+       protected function __construct($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Beim Schiff angelangt
                if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT')))
 
                // Beim Schiff angelangt
                if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT')))


@@ -50,7 +50,7 @@ class BaseShip extends BaseSimulator {
                        ));
 
                // Bezeichnung setzen
                        ));
 
                // Bezeichnung setzen

-               $this->setPartDescr("Schiff");
+               $this->setObjectDescription("Schiff");

 
                // Array-Objekt generieren
                $this->createStructuresArray();
 
                // Array-Objekt generieren
                $this->createStructuresArray();


@@ -60,16 +60,6 @@ class BaseShip extends BaseSimulator {
                $this->removeNumberFormaters();
        }
 
                $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();
        // Array-Objekt anlegen
        private function createStructuresArray () {
                $this->structures = new FrameworkArrayObject();


@@ -175,7 +165,7 @@ class BaseShip extends BaseSimulator {
                        __CLASS__,
                        __LINE__,
                        $this->getShipName(),
                        __CLASS__,
                        __LINE__,
                        $this->getShipName(),

-                       $partInstance->getPartDescr()
+                       $partInstance->getObjectDescription()

                ));
 
                // Alles klar!
                ));
 
                // 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 947bba2cfa074ee4a0c339d61197cbd1e11d429f..a581c120713946b36a54c2c7cb148b5c8303cdd4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PassengerShip extends BaseShip implements ConstructableShip, LimitableObject {
        // Konstruktor
  */
 class PassengerShip extends BaseShip implements ConstructableShip, LimitableObject {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Eltern-Kontruktor aufrufen
                // Eltern-Kontruktor aufrufen

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // 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
                }
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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
                                        $cab = $el->getPartInstance();
                                        if (!is_null($cab)) {
                                                // Kabinenbeschreibung holen

-                                               $cabType = $cab->getPartDescr();
+                                               $cabType = $cab->getObjectDescription();

                                        }
 
                                        // Debug-Meldung ausgeben
                                        }
 
                                        // 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] <strong>%s</strong> ist keine Kabine.<br />\n",
                                        __CLASS__,
                                        __LINE__,
                                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.<br />\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 <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $this->getPartDescr(),
+                       $this->getObjectDescription(),

                        $this->getShipName(),
                        $numBeds
                ));
                        $this->getShipName(),
                        $numBeds
                ));

diff --git a/application/ship-simu/main/structures/class_BaseStructure.php b/application/ship-simu/main/structures/class_BaseStructure.php
index 5259ca29e3778df4b59ee356544188a6f3b3744e..8620ce95d71d7544a0c26607d9ad19a32fccfdb2 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseStructure extends BaseSimulator {
        // Price of this structure
        private $price = 0.00;
 
        // Konstruktor (hier keine Exceptions aendern!)
  */
 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
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -39,22 +39,12 @@ class BaseStructure extends BaseSimulator {
                }
 
                // Set description
                }
 
                // Set description

-               $this->setPartDescr("Schiffsstrukturen");
+               $this->setObjectDescription("Schiffsstrukturen");

 
                // Clean up a little
                $this->removeNumberFormaters();
        }
 
 
                // 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;
        // 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 d0090311c72c001bb40b66200c198574237eabad..43e8a2010824a0ee807d1b71b491cfc3bd53ea90 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseCabin extends BaseCabinStructure {
        // Konstruktor
  */
 class BaseCabin extends BaseCabinStructure {
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -36,17 +36,7 @@ class BaseCabin extends BaseCabinStructure {
                }
 
                // Set description
                }
 
                // 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?
        }
 
        // 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 7b41210d7292e2ea92f9d0a69ec8830ccd43cbf8..63574618785e46c40cc24b69d96cb651a06b207a 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_EconomyCabin.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // 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
                }
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 ad0bc84ec9630575588bb82f0919f76ea4f5e390..46e9880cfe5372faec1ee46b0e8d25d7227a2bf1 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LowCabin.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 95333fb61534ee13611955098afb5f568b81927a..060060e59dbd8bb747c55a0a5c27ac8087d0c3d7 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 b4e5b74fbbc5030f252b68649e03e2410cb9c6a6..020fd14869857329c04a06b83a371e9a1cca9a52 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_PremierCabin.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[PremierCabin:] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 cf50ce16a54ed5b0fbe6f902229b12ff0ac2e628..31253aef2942264559b8ad3e13d45a2eed416189 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseCabinStructure extends BaseStructure {
        // --- Besondere Eigenschaften dazufuegen: ---
  */
 class BaseCabinStructure extends BaseStructure {
        // --- Besondere Eigenschaften dazufuegen: ---


@@ -33,9 +33,9 @@ class BaseCabinStructure extends BaseStructure {
        private $numBeds = 0;
 
        // Konstruktor
        private $numBeds = 0;
 
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -46,17 +46,7 @@ class BaseCabinStructure extends BaseStructure {
                }
 
                // Set description
                }
 
                // 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
        }
 
        // 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 <strong>%s</strong> wird f&uuml;r das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine <strong>%s</strong> wird f&uuml;r das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $cabinInstance->getPartDescr(),
+                       $cabinInstance->getObjectDescription(),

                        $shipInstance->getShipName()
                ));
 
                        $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 <strong>%s</strong> wurde in das Schiff eingebaut.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Kabine <strong>%s</strong> wurde in das Schiff eingebaut.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $cabinInstance->getPartDescr(),
+                       $cabinInstance->getObjectDescription(),

                        $shipInstance->getShipName()
                ));
        }
                        $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 e9476731a0248a7e88917e7618dd7e82744e4288..53f6a9cfdea08b63364c63872414028b435acb83 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseDeckStructure extends BaseStructure {
        // Anzahl Decks
        private $numDecks = 0;
 
        // Konstruktor
  */
 class BaseDeckStructure extends BaseStructure {
        // Anzahl Decks
        private $numDecks = 0;
 
        // Konstruktor

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -39,17 +39,7 @@ class BaseDeckStructure extends BaseStructure {
                }
 
                // Set description
                }
 
                // 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
        }
 
        // 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 <strong>%s</strong> wird f&uuml;r das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das Deck <strong>%s</strong> wird f&uuml;r das Schiff <strong>%s</strong> konstruiert.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $deckInstance->getPartDescr(),
+                       $deckInstance->getObjectDescription(),

                        $shipInstance->getShipName()
                ));
 
                        $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 <strong>%s</strong> wurde in das Schiff <strong>%s</strong> eingebaut.<br />\n",
                        __CLASS__,
                        __LINE__,
                if ((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das Deck <strong>%s</strong> wurde in das Schiff <strong>%s</strong> eingebaut.<br />\n",
                        __CLASS__,
                        __LINE__,

-                       $deckInstance->getPartDescr(),
+                       $deckInstance->getObjectDescription(),

                        $shipInstance->getShipName()
                ));
        }
                        $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 c930fee06c9cb37d8f51b88658e94475e9879eab..74eb19b0bcfc3695c57e7b740ac639a6420aef3a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseUpperStructure extends BaseStructure {
        /**
         * Constructor for all super structures on a ship
         */
  */
 class BaseUpperStructure extends BaseStructure {
        /**
         * Constructor for all super structures on a ship
         */

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
 
                // Debug message
                if (((defined('DEBUG_STRUCTURE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {


@@ -38,14 +38,7 @@ class BaseUpperStructure extends BaseStructure {
                }
 
                // Set description
                }
 
                // 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 ca4a9ddbcc7f42f82ad48252fe1660711b1db0ce..cf3289d64ecd4766f0c3e474c0c36ed8165c0d18 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_CarDeck.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 2c9bcbeced6c6a8d7aa6a4d64418a788296a89c7..d464f77bcea9d5c405ed8d987e219bc09828ce54 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TrainDeck.php
@@ -19,13 +19,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 4f29d603472fa80cc80026849c9628be9600e390..e23f894015097944be1bfb1428f0522a63cd7f56 100644 (file)
--- a/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php
+++ b/application/ship-simu/main/structures/extended/decks/cargo/class_TruckDeck.php
@@ -20,13 +20,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor
  */
 class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart {
        // Konstruktor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -35,7 +35,7 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart
                ));
 
                // Set description
                ));
 
                // Set description

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

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // 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 22da45c6a1b422cf4b749bc19d86a1ff2d75b30a..13768b8ca0780381b94bbb50ad3a0d85e5e98f4e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseDeck extends BaseDeckStructure {
        /**
         * Constructor for cargo decks in general
         */
  */
 class BaseDeck extends BaseDeckStructure {
        /**
         * Constructor for cargo decks in general
         */

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debub message
                if (((defined('DEBUG_DECK')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -36,17 +36,7 @@ class BaseDeck extends BaseDeckStructure {
                ));
 
                // Set description
                ));
 
                // 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 ec71072b447233a0b72e50c7421cb4d77239962b..239a7170835e4eed4adc86ddbf28bcf5d19aa9b8 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableShipPart {
        // Constructor
  */
 class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableShipPart {
        // Constructor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_MODE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",


@@ -34,7 +34,7 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS
                ));
 
                // Set description
                ));
 
                // Set description

-               $this->setPartDescr("Br&uuml;cke");
+               $this->setObjectDescription("Br&uuml;cke");

 
                // Generate unique ID number
                $this->createUniqueID();
 
                // Generate unique ID number
                $this->createUniqueID();

diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php
index 223ccc01c22c5810f430b5758f3ecaa85c0f7678..137ebbc1b6bca856be0e1ae68e680da628c21c20 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Is there an application helper instance? We need the method main() for
  */
 
 // Is there an application helper instance? We need the method main() for

diff --git a/inc/classes.php b/inc/classes.php
index 64e2bedc5861bfe5f940ac405c9aa0b3d55b791c..4b52f3f6c2446d02bcfdda6c1dd3ba4c403ab11f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Lower framework classes
  */
 
 // Lower framework classes

diff --git a/inc/classes/exceptions/class_FrameworkException.php b/inc/classes/exceptions/class_FrameworkException.php
index aaab83a9c363be1c41b5f46af2e809cc32ff9ffb..175b2b2176a2a4504139af33f513273f272de6a3 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 abstract class FrameworkException extends ReflectionException {
        /**
  */
 abstract class FrameworkException extends ReflectionException {
        /**

diff --git a/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php b/inc/classes/exceptions/compressor/class_MismatchingCompressorsException.php
index 2ca8d613e9a682c8282ee82adf229d5803942265..46f256375ce1f93ff2ad9a21e63d311ff0c1a2f7 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MismatchingCompressorsException extends FrameworkException {
        /**
  */
 class MismatchingCompressorsException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php b/inc/classes/exceptions/container/class_ContainerItemIsNoArrayException.php
index 405c39b0de243cbd44d38da01bf85c89b9579456..6fdc8250b90dd612004398979c99ed0ee8836f2b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ContainerItemIsNoArrayException extends FrameworkException {
        /**
  */
 class ContainerItemIsNoArrayException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/container/class_ContainerItemIsNullException.php b/inc/classes/exceptions/container/class_ContainerItemIsNullException.php
index 2cfafc4a0162b0f04a0b4aa9e73e93b277c6c407..6f17940f5142ca172c52ec2d6898c5318856efa8 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ContainerItemIsNullException extends FrameworkException {
        /**
  */
 class ContainerItemIsNullException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php b/inc/classes/exceptions/container/class_ContainerMaybeDamagedException.php
index 56686983e852da6caa45a239e0aff284f99f58f2..aa010fa4004fa96e74d1b3e535bae8fda7c94f13 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ContainerMaybeDamagedException extends FrameworkException {
        /**
  */
 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 efae626f91d73b6e045b08c9dcaf03db3dd2a8dd..7199369cb0cd7017607d3facc5a7398527c3cd54 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class SavePathIsEmptyException extends FrameworkException {
        /**
  */
 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 964a8d46e59bfa99377579c89d059162fd12720e..8d2c89b577c6cc619ae3694d10866e14d8481ae8 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class SavePathIsNoDirectoryException extends FrameworkException {
        /**
  */
 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 26b86b34ed75dd4f180f8a535e1c89d62247f8d6..d4a0de4af15909a124806ae023b3b8208f1013c1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class SavePathReadProtectedException extends FrameworkException {
        /**
  */
 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 4ad27906b454d61038d1513787e39f30740e5caf..a19d667d7907846436c5c657202f49573026a18d 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class SavePathWriteProtectedException extends FrameworkException {
        /**
  */
 class SavePathWriteProtectedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php b/inc/classes/exceptions/io/class_DirPointerNotOpenedException.php
index 060b01709529dab432c17049bf30382f08b8f43e..6be3455dde80a3fd7ec3ac6734a2aa0b821c9868 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DirPointerNotOpenedException extends FrameworkException {
        /**
  */
 class DirPointerNotOpenedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php b/inc/classes/exceptions/io/class_FilePointerNotOpenedException.php
index 9c7a8a8914b584173b9e501ae00a6307beb23cf0..4ecfc2e5511e7471742f13a369d9b212ba5cca09 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class FilePointerNotOpenedException extends FrameworkException {
        /**
  */
 class FilePointerNotOpenedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_InvalidDataLengthException.php b/inc/classes/exceptions/io/class_InvalidDataLengthException.php
index bc742135e782cc282d42be7165421c4c89692c72..310ab0b20157a90279b52c778b2d9a3ff3178a32 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidDataLengthException extends FrameworkException {
        /**
  */
 class InvalidDataLengthException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php b/inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php
index 668b0f0e41b0585acd9c628d901d78e077dd89c9..32de296d8dc667f5c911ac5e493f5b322e86dbd6 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidDirectoryResourceException extends FrameworkException {
        /**
  */
 class InvalidDirectoryResourceException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php b/inc/classes/exceptions/io/class_InvalidMD5ChecksumException.php
index 1aabdb48e719d9c66be6040b6240c98bc28815a7..2e1a51db059e0eff76f46c2097937c883d053897 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidMD5ChecksumException extends FrameworkException {
        /**
  */
 class InvalidMD5ChecksumException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_PathIsEmptyException.php b/inc/classes/exceptions/io/class_PathIsEmptyException.php
index 4c93d20e1010c95023f4ac0b6ba6dc4103f83de3..77a4a54c555130e087c632526a6f9476ba2f4510 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PathIsEmptyException extends FrameworkException {
        /**
  */
 class PathIsEmptyException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php b/inc/classes/exceptions/io/class_PathIsNoDirectoryException.php
index 2ff79ba9341cee2d54a891fe5c62891e98f9b4a2..fbf48000b2cb562cad2fc17747c4299ea68a85fd 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PathIsNoDirectoryException extends FrameworkException {
        /**
  */
 class PathIsNoDirectoryException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/io/class_PathReadProtectedException.php b/inc/classes/exceptions/io/class_PathReadProtectedException.php
index 70ea7c0199e0239931d7d75b26cdc96fbf1e5dec..14891d7139ff9277163e47cf5618ef311f39005a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class PathReadProtectedException extends FrameworkException {
        /**
  */
 class PathReadProtectedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php b/inc/classes/exceptions/language/class_InvalidLanguagePathStringException.php
index 5161c23d8b8950a989c8c03e7631c52a0c8d2e12..536a073ece29f5499bb0d1d5dccd53f9a5820813 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidLanguagePathStringException extends FrameworkException {
        /**
  */
 class InvalidLanguagePathStringException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php b/inc/classes/exceptions/language/class_LanguagePathIsEmptyException.php
index 653f4c0e9333b16bf721ceefd7d545e8883abc8c..e1aef2a433b703fe1f96e7cd9cfe81ad26c4deec 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class LanguagePathIsEmptyException extends FrameworkException {
        /**
  */
 class LanguagePathIsEmptyException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/inc/classes/exceptions/language/class_LanguagePathIsNoDirectoryException.php
index 6a672af7aaf14847d574ea62a8abf529d4f183a6..3772ee03ac308b6e12d44da015f41013c72d59c2 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class LanguagePathIsNoDirectoryException extends FrameworkException {
        /**
  */
 class LanguagePathIsNoDirectoryException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php b/inc/classes/exceptions/language/class_LanguagePathReadProtectedException.php
index ccfd2c37177383af0e895bcbf0a9dc2b57ee5a40..1ac1a940e6664ce60ce8b2ca961f55b2e10ebaef 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class LanguagePathReadProtectedException extends FrameworkException {
        /**
  */
 class LanguagePathReadProtectedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php b/inc/classes/exceptions/language/class_MissingFileIoHandlerException.php
index 9a5646627669e4e6469768938df1fd4293f9b453..f8d5e2d28e87027b713173db26e4927c56f41557 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingFileIoHandlerException extends FrameworkException {
        /**
  */
 class MissingFileIoHandlerException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php b/inc/classes/exceptions/language/class_MissingLanguageHandlerException.php
index 4b2ef13cbadcc4d56325f85db12a29af19ae1029..0a3171a760870d6c25f5fb3b7f27fda09e313926 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingLanguageHandlerException extends FrameworkException {
        /**
  */
 class MissingLanguageHandlerException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ClassMismatchException.php b/inc/classes/exceptions/main/class_ClassMismatchException.php
index b4820015719a3685ca76535ea4a451f176022ba6..a17ecdf3156f498cf7239f67b15e9e65b9d0bf3b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ClassMismatchException extends FrameworkException {
        /**
  */
 class ClassMismatchException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ClassNotFoundException.php b/inc/classes/exceptions/main/class_ClassNotFoundException.php
index b7242e72768cb130be63625afa4e9f8a8f22df8a..ba1efd6718f631ca3092eb0f62fe83cde6712434 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ClassNotFoundException extends FrameworkException {
        /**
  */
 class ClassNotFoundException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php b/inc/classes/exceptions/main/class_ConfigEntryIsEmptyException.php
index f16e3658073820bb791f0461263a99cb0b13bcb7..781adca4517ee0a79431402e283347e4609697b9 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ConfigEntryIsEmptyException extends FrameworkException {
        /**
  */
 class ConfigEntryIsEmptyException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php b/inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php
index b753bdf93a7a75261340060e77856eeb94047514..80cef7ce727d3bb1411709795642464c5921885e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ConfigEntryNotFoundException extends FrameworkException {
        /**
  */
 class ConfigEntryNotFoundException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php b/inc/classes/exceptions/main/class_DimNotFoundInArrayException.php
index 4e0bcfb714268dbeda1018a0adcd4e51ed933b17..484a41438befddfe8f978d8d4bb752f5c7c8adec 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DimNotFoundInArrayException extends FrameworkException {
        /**
  */
 class DimNotFoundInArrayException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ExceptionNotChangedException.php b/inc/classes/exceptions/main/class_ExceptionNotChangedException.php
index af6ae2c9154e9fbbe4d05ac7aee878e7aa8facf2..e23adfa9ed3129ff920050cdd7ceccfabba3d5be 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ExceptionNotChangedException extends FrameworkException {
        /**
  */
 class ExceptionNotChangedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_ExceptionNotFoundException.php b/inc/classes/exceptions/main/class_ExceptionNotFoundException.php
index 33867ae4d2d2718d7ed1e70828cfba6452b87b56..fe502153b838b8b442d8996eed722d8fcb932423 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ExceptionNotFoundException extends FrameworkException {
        /**
  */
 class ExceptionNotFoundException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_GetterNotFoundException.php b/inc/classes/exceptions/main/class_GetterNotFoundException.php
index 64a402b2a3e2b19522001ae0d38f1019f30edd06..c89c0d2519ddf0720891d7ae2c3a99c75569b94e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class GetterNotFoundException extends FrameworkException {
        /**
  */
 class GetterNotFoundException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_InvalidArrayCountException.php b/inc/classes/exceptions/main/class_InvalidArrayCountException.php
index 215d1ab2bb898aa9aed636563a75853ec003c5ef..75fa5440c0cc47551551fc12631b146d116ab998 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidArrayCountException extends FrameworkException {
        /**
  */
 class InvalidArrayCountException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_InvalidObjectException.php b/inc/classes/exceptions/main/class_InvalidObjectException.php
index 76a4a4cb0449db53f19c5f0d5f52f841612d453b..08d92dffbdfaf2b6bf3cfac8c90a1f418a7e8a98 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidObjectException extends FrameworkException {
        /**
  */
 class InvalidObjectException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_MissingArrayElementsException.php b/inc/classes/exceptions/main/class_MissingArrayElementsException.php
index eed1c9b3a897a157be8d64115c7d73f1d50aa0f8..5d483db5e9f93955076aa3a09bbb1edf2c6c42e4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingArrayElementsException extends FrameworkException {
        /**
  */
 class MissingArrayElementsException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php b/inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php
index 771bf7b6e77f7097db7d2975973a657b71cb1818..8ccc62e66661cdfc7817628eedac1e51cdc10ca7 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingDecimalsThousandsSeperatorException extends FrameworkException {
        /**
  */
 class MissingDecimalsThousandsSeperatorException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_MissingMethodException.php b/inc/classes/exceptions/main/class_MissingMethodException.php
index d8bd326c5055616e4d6196b7b54312970feeb2c6..8855e5d19ff9de4263849cf615acec67a9f6b6c1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class MissingMethodException extends FrameworkException {
        /**
  */
 class MissingMethodException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_NoArrayCreatedException.php b/inc/classes/exceptions/main/class_NoArrayCreatedException.php
index dd1e7fa75127fc608903953046025e7d3a0987a3..b741fdf475d8af26501ea5e24dfa172b20101b0d 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class NoArrayCreatedException extends FrameworkException {
        /**
  */
 class NoArrayCreatedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_NoArrayException.php b/inc/classes/exceptions/main/class_NoArrayException.php
index eacfca363511b21b04b975d159c2ff7514b9fc70..e885801845bd82583967882cead5ce703789aeaa 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class NoArrayException extends FrameworkException {
        /**
  */
 class NoArrayException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_NoObjectException.php b/inc/classes/exceptions/main/class_NoObjectException.php
index c1696850002f1ed2b7fb0668755960cb8df48341..8cd3c3e068c7a3fa9518d471fc0c76a728edc57f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class NoObjectException extends FrameworkException {
        /**
  */
 class NoObjectException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_NullPointerException.php b/inc/classes/exceptions/main/class_NullPointerException.php
index 489465a0d6585dcf1c54c0991b97c23f56e0002f..0a16aae1c1d94d3390228e147ce4adfc3d5a4de4 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class NullPointerException extends FrameworkException {
        /**
  */
 class NullPointerException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/main/class_VariableIsNotSetException.php b/inc/classes/exceptions/main/class_VariableIsNotSetException.php
index 9c9a51f4a03244715b9d7ac7bfd529928eb733df..84daff19d39139c53715c24642741ee9051dc788 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class VariableIsNotSetException extends FrameworkException {
        /**
  */
 class VariableIsNotSetException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_BasePathIsEmptyException.php b/inc/classes/exceptions/template/class_BasePathIsEmptyException.php
index e155afe735563beb2037a1fa26867216ff2f62e7..3009863929f068a7ca41974abd74c1c31e8549ad 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BasePathIsEmptyException extends FrameworkException {
        /**
  */
 class BasePathIsEmptyException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php b/inc/classes/exceptions/template/class_BasePathIsNoDirectoryException.php
index 271b447836bbf16a47ebb8aa71695d988e131ece..9dc01e21e09f538c1246519a1378a23bfca09a50 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BasePathIsNoDirectoryException extends FrameworkException {
        /**
  */
 class BasePathIsNoDirectoryException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_BasePathReadProtectedException.php b/inc/classes/exceptions/template/class_BasePathReadProtectedException.php
index 535071766e52ceea1ccaebc62e46d712d5519028..37b10b235db9bb9dbc28f0614d346d19bf9ae7e8 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BasePathReadProtectedException extends FrameworkException {
        /**
  */
 class BasePathReadProtectedException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_InvalidBasePathStringException.php b/inc/classes/exceptions/template/class_InvalidBasePathStringException.php
index 729aca9a4cbdfb01b5a85930cda0b6f60b464134..095ed8bfd2841406b46d4d0912cd7c83965bfd3a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidBasePathStringException extends FrameworkException {
        /**
  */
 class InvalidBasePathStringException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php b/inc/classes/exceptions/template/class_InvalidTemplateVariableNameException.php
index 8a3151cc0db682272295a9a8655f8e6e12c5ca2c..f625ccccf582904a34cfd2a78537d603536166ef 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class InvalidTemplateVariableNameException extends FrameworkException {
        /**
  */
 class InvalidTemplateVariableNameException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php b/inc/classes/exceptions/template/class_UnexpectedTemplateTypeException.php
index b1d0d14b8164dd0882df65b4a5f8c99d72b44031..ba37050a3fca4e4c04d1bea0f6e380e0b320f56e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class UnexpectedTemplateTypeException extends FrameworkException {
        /**
  */
 class UnexpectedTemplateTypeException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php b/inc/classes/exceptions/template/class_UnsupportedTemplateEngineException.php
index 9a8560a202b78810b6cb81a0ba0ba0d73e704f84..a66fda39c5678b322f8b7cb920ed64b989fa3e15 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class UnsupportedTemplateEngineException extends FrameworkException {
        /**
  */
 class UnsupportedTemplateEngineException extends FrameworkException {
        /**

diff --git a/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php b/inc/classes/exceptions/template/class_ViewHelperNotFoundException.php
index 78cb6735eb239df8eca0d477db3d94c36a7fe5af..ece8b343b1163e7a2d819cd73f6d700d376011e7 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class ViewHelperNotFoundException extends FrameworkException {
        /**
  */
 class ViewHelperNotFoundException extends FrameworkException {
        /**

diff --git a/inc/classes/interfaces/application/class_ManageableApplication.php b/inc/classes/interfaces/application/class_ManageableApplication.php
index f342a0a7ca16fd5404e24e14af17e42ad7330e72..81ff0c44929e31c4f6c14e95ac4a0f0ca195edca 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ManageableApplication extends FrameworkInterface {
        /**
  */
 interface ManageableApplication extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/class_ b/inc/classes/interfaces/class_
index 906a8adb197314565df7f2923ec7b194debd4232..1e4ea82f6146d05f794afb6ab7026cde2ed06484 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface  extends FrameworkInterface {
 }
  */
 interface  extends FrameworkInterface {
 }

diff --git a/inc/classes/interfaces/class_FrameworkInterface.php b/inc/classes/interfaces/class_FrameworkInterface.php
index 733d665a1d6ad72303b3ecfa502ba591728456b3..2906fce80abff3560a49411fa3b5727bf1ec5ad5 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface FrameworkInterface {
 }
  */
 interface FrameworkInterface {
 }

diff --git a/inc/classes/interfaces/commands/class_Commandable.php b/inc/classes/interfaces/commands/class_Commandable.php
index e8397c59cb781e975fbaacb21c806f8d33c39ef4..ab5b53a0fa5c2bee412ce43fc72ab2b1e26067de 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Commandable extends FrameworkInterface {
        /**
  */
 interface Commandable extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/compressor/class_Compressor.php b/inc/classes/interfaces/compressor/class_Compressor.php
index 0e3182a0bcfe85e879bcd92691b4dea59134df3f..0ce342ef7efa43032ccc1f3472458c84c631a249 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Compressor extends FrameworkInterface {
        /**
  */
 interface Compressor extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php b/inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php
index 3031f60f8e4df02206dd564b3ad956c8fdd84092..5605da3b4967b3eb73dddd0ced7130b01e006fa9 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface FrameworkDatabaseInterface extends FrameworkInterface {
        /**
  */
 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 b6043b396661feae9b6a3c0777c7860df0d99d86..93bbd198f8b4b72a6781943caa3537ade6d80702 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface DatabaseFrontendInterface extends FrameworkDatabaseInterface {
        /**
  */
 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 e9f5031d179f660982643df43bf1c0f0ed89bd26..4945d14863ecf7f72eb095e1e40330d4e3391060 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface DatabaseConnector extends FrameworkDatabaseInterface {
 }
  */
 interface DatabaseConnector extends FrameworkDatabaseInterface {
 }

diff --git a/inc/classes/interfaces/debug/class_Debugger.php b/inc/classes/interfaces/debug/class_Debugger.php
index eeffbf24155dcd2486bc547cf90a68d3957d9d26..1b76bcfe425ef0db85005a0215ab2186c473a4a6 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Debugger extends FrameworkInterface {
        /**
  */
 interface Debugger extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/extended/class_LimitableObject.php b/inc/classes/interfaces/extended/class_LimitableObject.php
index 591a21e82e15bef0dace787ed2a5a560763af794..212e189a6108bbb7a55544a9a5c1ed3527a7ad4e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface LimitableObject extends FrameworkInterface {
        /**
  */
 interface LimitableObject extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/io/class_Streamable.php b/inc/classes/interfaces/io/class_Streamable.php
index 4763acbf518a604bb7a842edfe7d8fa1b7632187..ca1a76e9c8b56e59ce6efaf87e2d7292fdbbac3e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Streamable extends FrameworkInterface {
 }
  */
 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 e13174aec5c1f69b0ddb050d35e6f22ccf9f50df..75dc429d23435ffbcce9782079fe86396f2e068f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface FileInputStreamer extends Streamable {
        /**
  */
 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 e0f55e4f50b0b3d5db5c6d2ee8a9c776e5f73f72..a3f896d912095d8d69a0aaf22efd3bd2d843ea63 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface FileOutputStreamer extends Streamable {
        /**
  */
 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 a803a46995788700ed195f397a6b40dbed2dbbbb..992f504053ad81cafa48bf189ff217134732201a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface OutputStreamer extends Streamable {
        /**
  */
 interface OutputStreamer extends Streamable {
        /**

diff --git a/inc/classes/interfaces/language/class_ManageableLanguage.php b/inc/classes/interfaces/language/class_ManageableLanguage.php
index 9ffec52010579f9353196b379b625ece4b685fd3..7e3c0fb1b7b72f1d388aa62206454c830a59fa23 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ManageableLanguage extends FrameworkInterface {
        /**
  */
 interface ManageableLanguage extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/request/class_Requestable.php b/inc/classes/interfaces/request/class_Requestable.php
index 7ef0f9a399c6e72d88f64fbaa277f56de8d39f2c..0571e0089c2660d1393f2664f4e6b4e7c46d801c 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Requestable extends FrameworkInterface {
        /**
  */
 interface Requestable extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/response/class_Responseable.php b/inc/classes/interfaces/response/class_Responseable.php
index 22ee2cbe08c3a8fbd1eef25557064cb54cd1857b..f83e7f9d20c506f72b6c82f31769eadac131107d 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface Responseable extends FrameworkInterface {
        /**
  */
 interface Responseable extends FrameworkInterface {
        /**

diff --git a/inc/classes/interfaces/template/class_CompileableTemplate.php b/inc/classes/interfaces/template/class_CompileableTemplate.php
index f6dc5771718b053a1a69b42c1455825622fae509..0bf75561ff2986e57c3efa53b24a756b65e5b263 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface CompileableTemplate extends FrameworkInterface {
        /**
  */
 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 1de45ff2de593f0d30640fa743209be96f172a2d..36c0dde1c71842889ceca2232684b41b5ebc5a0b 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 interface ViewHelper extends FrameworkInterface {
        /**
  */
 interface ViewHelper extends FrameworkInterface {
        /**

diff --git a/inc/classes/main/class_ b/inc/classes/main/class_
index 1701d1d0762f087b4233c18035bfa8c7b671c255..26ff8be747a7431c20a95927518eba87ee7c53e2 100644 (file)
--- a/inc/classes/main/class_
+++ b/inc/classes/main/class_
@@ -27,9 +27,9 @@ class  extends BaseFrameworkSystem {
         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("");
 
                // Set part description
                $this->setObjectDescription("");

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index f053ac3ff8f1d7b3a9c4cb14a69d49397dc44ba1..796860a240861b315167783a24ceb3f395d7653f 100644 (file)
--- 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
         */
         *
         * @return      void
         */

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Set real class
                $this->setRealClass($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
         */
         *
         * @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());
 
                // Get the current (singleton) configuration instance
                $this->setConfigInstance(FrameworkConfiguration::createFrameworkConfiguration());
 


@@ -287,12 +287,12 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
        /**
         * Setter for language instance
         *
        /**
         * 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) {
         *                                                      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 <strong>%s</strong> gesetzt.<br />\n",
                        $this->__toString(),
                        $configInstance->__toString()
                if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Konfigurations-Handler auf <strong>%s</strong> gesetzt.<br />\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 <strong>%s</strong> angefordert.<br />\n",
                        $this->__toString(),
        public final function getConfigInstance () {
                if ((defined('DEBUG_SYSTEM')) && (is_object($this->getDebugInstance()))) $this->getDebugInstance()->output(sprintf("[%s:] Konfigurations-Handler <strong>%s</strong> angefordert.<br />\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 06c6be68442e932c491bf3e92142eb7777c254be..69a3363661f241e2c529c27f3cd3ddccb9bd5c8d 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 class FrameworkArrayObject extends ArrayObject {
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 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
         *
        /**
         * Get real class' name back
         *

diff --git a/inc/classes/main/commands/class_BaseCommand.php b/inc/classes/main/commands/class_BaseCommand.php
index 69a3f79fcd46448cb141c2e21181fc8b3f7b9607..501c1ff5647907e493d64781a11e8ebe23da3463 100644 (file)
--- a/inc/classes/main/commands/class_BaseCommand.php
+++ b/inc/classes/main/commands/class_BaseCommand.php
@@ -23,23 +23,13 @@
  */
 class BaseCommand extends BaseFrameworkSystem {
        /**
  */
 class BaseCommand extends BaseFrameworkSystem {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // 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 b71893678e5f75a453a1aa5c14d67992c6815ee3..e4fc44389c00e34615455af70123b4e0deb0bd1b 100644 (file)
--- 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
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set special description
                $this->setObjectDescription("Spezieller Command");
 
                // 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 a05da30f2eb60c6f24829721101c88c1a3cbf08a..2cadc808ee7d2aad78cfbbd1c5e8855444329511 100644 (file)
--- 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 {
        /**
  */
 class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor!
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",

diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php
index 2d07bcb55d04c2d35c1740d07a50aa70b67a2a25..ae5926776c82f0361c294807036c3bca0906f457 100644 (file)
--- 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 {
        /**
  */
 class GzipCompressor extends BaseFrameworkSystem implements Compressor {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor!
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",

diff --git a/inc/classes/main/compressor/class_NullCompressor.php b/inc/classes/main/compressor/class_NullCompressor.php
index 2f174338dfcfa7cd7b62bebd25030768f64b0ea4..742ab02b09135823436d30a4b78102b08ae71bc7 100644 (file)
--- 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 {
        /**
  */
 class NullCompressor extends BaseFrameworkSystem implements Compressor {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor!
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_COMPRESSOR')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 367fa80dab7138f0d79365336ab64e553a00bc73..3e9e9d78129d33df3e6a86749db69248d7ccda09 100644 (file)
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -23,13 +23,13 @@
  */
 class ConsoleTools extends BaseFrameworkSystem {
        /**
  */
 class ConsoleTools extends BaseFrameworkSystem {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Console-Tools");
 
                // 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 4022a77c9370f1ea3bc5a3b3d31d05a564ec3149..82dba69d6f22d4bec610326317c56ac54909f389 100644 (file)
--- a/inc/classes/main/controller/class_BaseController.php
+++ b/inc/classes/main/controller/class_BaseController.php
@@ -23,27 +23,17 @@
  */
 class BaseController extends BaseFrameworkSystem {
        /**
  */
 class BaseController extends BaseFrameworkSystem {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

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

-
-       /**
-        * The public constructor
-        *
-        * @return      void
-        */
-       public function constructor ($class) {
-               // Calls just the private one
-               $this->__construct($class);
-       }

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

diff --git a/inc/classes/main/database/class_BaseDatabaseFrontend.php b/inc/classes/main/database/class_BaseDatabaseFrontend.php
index 7d25170a56facf900815f6817935a37482627f5b..a4220e0ac444598a77e2c486ffa8a0dfe53e921d 100644 (file)
--- 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 $limitInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct($class) {
+       protected function __construct($class) {

                // Call parent constructor
                // 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.<br />\n",
 
                // Debug message
                if (((defined('DEBUG_DATABASE')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:] Konstruktor erreicht.<br />\n",


@@ -46,16 +46,6 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem implements Datab
                $this->removeNumberFormaters();
        }
 
                $this->removeNumberFormaters();
        }
 

-       /**
-        * The public constructor
-        *
-        * @return      void
-        */
-       public function constructor ($class) {
-               // Calls just the private one
-               $this->__construct($class);
-       }
-

        /**
         * Getter for limitation instance
         *
        /**
         * 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 8530dbda0d5513535669c5103d102c97b9748252..37481082a8ab0ddb08639e49ed69a0233150c142 100644 (file)
--- 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
         */
         *
         * @return      void
         */

-       private function __construct() {
+       protected function __construct() {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Dateidatenbankschicht");
 
                // Set description
                $this->setObjectDescription("Dateidatenbankschicht");

diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index ba5c0650866982a92495411b53b624adb6bfa366..a019c3f5697f7ae3509fe70d1d8b747f3e5d99bb 100644 (file)
--- 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 {
        /**
  */
 class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Debug-Ausgabe auf Konsole");
 
                // 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 75194c9c5ae726bc8b6e4365d60072556dc9088a..a26867b519b3e49dc8a5748e0b3f871e57ab5cf9 100644 (file)
--- 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 {
        /**
  */
 class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Debug-Ausgabe in error_log()");
 
                // 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 c0b26e6220d300b1a65c5453a27c7fc095fa41ad..a7ed41dd5a873395082a18a40a73a3fd82dfe4b0 100644 (file)
--- 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 {
        /**
  */
 class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStreamer {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Debug-Ausgabe auf Konsole");
 
                // 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 880928d70f2757620524843177285886005bf49d..a2eccc39dca768a9560e2404cb077542389a4434 100644 (file)
--- 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 $limitArray = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Limitierungsobjekt");
 
                // 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 f78c72e346c523af2aafd2867d2f89452a9a22de..94da00be4f10b3f47f02fb156f833354f7f1e782 100644 (file)
--- 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
         */
        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.<br />\n");
 
                // Debug message
                if ((defined('DEBUG_CONTAINER')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[SerializationContainer:] Konstruktor erreicht.<br />\n");

diff --git a/inc/classes/main/io/class_FileIOStream.php b/inc/classes/main/io/class_FileIOStream.php
index 92351ddb00be80214a655f39bb426002b60c3b7e..39acf09e1dadf4befc7e2f7dc40a585b9537f996 100644 (file)
--- 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 {
        /**
  */
 class FileIOStream extends BaseFrameworkSystem implements FileInputStreamer, FileOutputStreamer {
        /**

-        * Private constructor
+        * Protected constructor

         */
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Universal Datei-Ein-/Ausgabesystem");
 
                // 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 5610d14225fcd75f6020f249dd763124f15c11e2..553e6336aed3b4876052f594ef53d316d765ea4e 100644 (file)
--- 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 $dirPointer = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         */
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Verzeichnis-Handler");
 
                // 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 56e3488b62897243a2c438196d577b3a24baaa37..3834de9a9f5627d63781a9f51dae7d59d55c3ea0 100644 (file)
--- 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 $filePointer = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         */
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Dateiausgabe-Handler");
 
                // 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 f3d911a88d2859b55233c036437bd2e7acea12de..cf7f4912b79f37a1785880bef82b642c05126b5b 100644 (file)
--- 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 $filePointer = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         */
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Dateiausgabe-Handler");
 
                // 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 12ce65553f7f9b28427d5b70949f8e4027e25466..1ed28e473b9d289e4e7f61fe7b4ead4788d4c454 100644 (file)
--- 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 static $thisInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Sprachsystem");
 
                // 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 fc4d7502e5dee41447046d9a625d693afb7a10c3..7bd058852f3f97a8146ddd7bcf061efc911c28b9 100644 (file)
--- 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 $vars = array();
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Console-Ausgabe-Handler");
 
                // 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 8f17649b600fc59129f42993d1f3bf202571e234..1312f337f68365f6c6a39aae52d08b7280961a7f 100644 (file)
--- 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 static $webInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Web-Ausgabe-Handler");
 
                // 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 635b0fd9c18b616c93eda79b7eb64408375890dc..ca85b974043bdca7f154e109b1a8005eb05da14b 100644 (file)
--- 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 $requestData = array();
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("HTTP-Anfrage");
 
                // 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 04cb16f9ca8ce0cfef2fa09b46114ab5d90a0f9e..8b29afeda321b7683c7adcf4875f84d51f58422e 100644 (file)
--- 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 $responseBody = "";
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("HTTP-Antwort");
 
                // 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 a8479ddf6979f5ca9e07cb58ba034d67f3a60898..4fdb1a34dfb042c17b6adfb31866ca5b4235c0ea 100644 (file)
--- 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;
 
        /**
        const EXCEPTION_INVALID_VIEW_HELPER           = 0xa02;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set part description
                $this->setObjectDescription("Template-Engine");
 
                // Set part description
                $this->setObjectDescription("Template-Engine");

diff --git a/inc/classes/middleware/class_BaseMiddleware.php b/inc/classes/middleware/class_BaseMiddleware.php
index 88bc16e12b65998ffe7b62f743e9e1472cc6da75..9b576dda6702e5ed9a1d2f3041fb47eeea4d9a67 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class BaseMiddleware extends BaseFrameworkSystem {
        /**
  */
 class BaseMiddleware extends BaseFrameworkSystem {
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct ($class) {
+       protected function __construct ($class) {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor($class);
+               parent::__construct($class);

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

-
-       /**
-        * Public constructor
-        *
-        * @return      void
-        */
-       public function constructor ($class) {
-               // Just call the private constructor
-               $this->__construct($class);
-       }

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

diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php
index 8dae607bbfc0822031851f1f614da6274be9d2d1..da8b48461035bf863de4a3e2f405cca944e0fa4a 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class CompressorChannel extends BaseMiddleware {
        // Output handler instance
        private $compressor = null;
 
        // Public constructor
  */
 class CompressorChannel extends BaseMiddleware {
        // Output handler instance
        private $compressor = null;
 
        // Public constructor

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor!
                // Call parent constructor!

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Komprimierungshandler");
 
                // Set description
                $this->setObjectDescription("Komprimierungshandler");

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index d7db9d86975c88bc86b2c58d08df5c065ed9d18c..402677b190f187840ec1f896faa67c47c7a96694 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, LimitableObject {
        // Array for connection data
  */
 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;
 
        // An instance of this class
        private static $thisInstance = null;
 

-       // Private constructor
-       private final function __construct() {
+       // Protected constructor
+       protected function __construct() {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Datenbank-Mittelschicht");
 
                // 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 2cc48823303bad3824e0e3f7803cf3a17aa09851..4a134324cf4eaab0b81788bc8ce26fdb0fe1eb7d 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class DebugMiddleware extends BaseMiddleware {
        /**
  */
 class DebugMiddleware extends BaseMiddleware {
        /**


@@ -35,13 +35,13 @@ class DebugMiddleware extends BaseMiddleware {
        private static $thisInstance = null;
 
        /**
        private static $thisInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private final function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Debug-Ausgabe-Handler");
 
                // 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 7e0d35ad52d99f050d1091bd22662ed69c1b9cef..fa6937c2ca3512030ff7cfb001420eecc63d57b2 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 class FileIOHandler extends BaseMiddleware {
        /**
  */
 class FileIOHandler extends BaseMiddleware {
        /**


@@ -39,13 +39,13 @@ class FileIOHandler extends BaseMiddleware {
        private static $thisInstance = null;
 
        /**
        private static $thisInstance = null;
 
        /**

-        * Private constructor
+        * Protected constructor

         *
         * @return      void
         */
         *
         * @return      void
         */

-       private function __construct () {
+       protected function __construct () {

                // Call parent constructor
                // Call parent constructor

-               parent::constructor(__CLASS__);
+               parent::__construct(__CLASS__);

 
                // Set description
                $this->setObjectDescription("Datei-Ein-/Ausgabe-Handler");
 
                // Set description
                $this->setObjectDescription("Datei-Ein-/Ausgabe-Handler");

diff --git a/inc/config.php b/inc/config.php
index ab944bf11599b7057a678acae0b6e900d0866fb2..e104b41caf67dfef6a2551f5f63585f466aab3c6 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Load the class from inc/config direktory
  */
 
 // Load the class from inc/config direktory

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index dd19e195788cee64a62817d298a35addb8891167..9f919fa900bec40f2025dda1696365ee5dcef1bf 100644 (file)
--- 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;
 
        /**
        const EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND = 0xc01;
 
        /**

-        * Private constructor
+        * Protected constructor

         */
         */

-       private function __construct () {
+       protected function __construct () {

                // Empty for now
        }
 
                // Empty for now
        }
 

diff --git a/inc/database.php b/inc/database.php
index a8a9fcf41667c3c581e3c336a88de4c5f57bce44..bba0192e34894c83d6c6cf59c780e50ac07f0e8e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Initialize layer
  */
 
 // Initialize layer

diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php
index a689fed4bc556e1c2bb7482568e7e0302231f681..3e1ebc5623b6c91f0aa07257dcf5657687289904 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Zum Testen speichern wir in lokale Dateien (LocalFileDatabase)
  */
 
 // Zum Testen speichern wir in lokale Dateien (LocalFileDatabase)

diff --git a/inc/file_io.php b/inc/file_io.php
index 92c96b6c417498d36dd16857c860713f05dde013..eb37543bf75e85766cfbbf0a85a3b9146b4ea964 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Get the instance
  */
 
 // Get the instance

diff --git a/inc/includes.php b/inc/includes.php
index c9158581e7c6ffdce0e64538e0687ef2e1926d15..f6aeeac965f232465dae77a4a70332ada19f0f84 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Include the class loader function
  */
 
 // Include the class loader function

diff --git a/inc/language.php b/inc/language.php
index c806545399656b92b20c528532441b73ef6bd63d..1711acf6a287b15ed1d4653377b1f559d2a4b6d1 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 try {
        $lang = LanguageSystem::createLanguageSystem(sprintf("%s%s",
  */
 try {
        $lang = LanguageSystem::createLanguageSystem(sprintf("%s%s",

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 79389f647d41688511137437c1472586e8c40455..9d4ddbe21e343217537a031562749fad4719659e 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  *
  * ----------------------------------
  * 1.1
  *
  * ----------------------------------
  * 1.1

diff --git a/inc/output.php b/inc/output.php
index 87e838432964783d606c1c30bd6a74504be80dc0..b77df4a5b3d161b3932ae0aa1fedf175373fbf20 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Debug-Ausgabe vorbereiten
  */
 
 // Debug-Ausgabe vorbereiten

diff --git a/inc/selector.php b/inc/selector.php
index 7af8aa06056930c71b21265d9898aca8fb9c3539..a8bb1fdf480da63db484583dc0693f02d56e680f 100644 (file)
--- 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
  * 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 <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */
 
 // Does the user has an application specified?
  */
 
 // Does the user has an application specified?