Cleanups, re-initialization of stackers added:

- Moved patch_i.sh to contrib
- Marked MissingMethodException as deprecated (old-lost exception)
- Stackers can be forced to re-initialize (aka. "reset")

diff --git a/inc/classes/exceptions/main/class_MissingMethodException.php b/inc/classes/exceptions/main/class_MissingMethodException.php
index 0426106a396449e11292b320a030a75b7f98ebf5..e33095c1f6b3b0b6e669f4d6a715698e94f0b921 100644 (file)
--- a/inc/classes/exceptions/main/class_MissingMethodException.php
+++ b/inc/classes/exceptions/main/class_MissingMethodException.php
@@ -11,6 +11,7 @@
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               Try to rewrite user/guest login classes and mark this exception as deprecated
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               Try to rewrite user/guest login classes and mark this exception as deprecated

+ * @deprecated Please do no longer use this exception

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/inc/classes/main/stacker/class_BaseStacker.php b/inc/classes/main/stacker/class_BaseStacker.php
index b029e4e2ca920ed0fe2b06fb01be3157e8b0c8d5..0251661dfa753f476ad339b36a65861b95a3e4fd 100644 (file)
--- a/inc/classes/main/stacker/class_BaseStacker.php
+++ b/inc/classes/main/stacker/class_BaseStacker.php
@@ -48,12 +48,13 @@ class BaseStacker extends BaseFrameworkSystem {
         * Initializes given stacker
         *
         * @param       $stackerName    Name of the stack
         * Initializes given stacker
         *
         * @param       $stackerName    Name of the stack

+        * @param       $forceReInit    Force re-initialization

         * @return      void
         * @throws      AlreadyInitializedStackerException      If the stack is already initialized
         */
         * @return      void
         * @throws      AlreadyInitializedStackerException      If the stack is already initialized
         */

-       public final function initStacker ($stackerName) {
+       public final function initStacker ($stackerName, $forceReInit = false) {

                // Is the stack already initialized?
                // Is the stack already initialized?

-               if ($this->isStackInitialized($stackerName)) {
+               if (($forceReInit === true) && ($this->isStackInitialized($stackerName))) {

                        // Then throw the exception
                        throw new AlreadyInitializedStackerException(array($this, $stackerName), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
                } // END - if
                        // Then throw the exception
                        throw new AlreadyInitializedStackerException(array($this, $stackerName), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
                } // END - if

diff --git a/patch_i.sh b/patch_i.sh
deleted file mode 100755 (executable)
index 725fc72..0000000
--- a/patch_i.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-patch -p0 < i || exit 10
-svn commit || exit 10
-rm i