From: Roland Häder <roland@mxchange.org>
Date: Sun, 10 Jul 2022 10:31:37 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=93ca071880213fa2472521c3bb505a0745a24e8e;p=core.git

Continued:
- AlreadyInitializedStackerException was an already deprecated method, as
  BadMethodCallException can do perfectly the same job
---

diff --git a/framework/main/classes/stacker/class_BaseStacker.php b/framework/main/classes/stacker/class_BaseStacker.php
index d823829d..b9f80972 100644
--- a/framework/main/classes/stacker/class_BaseStacker.php
+++ b/framework/main/classes/stacker/class_BaseStacker.php
@@ -63,7 +63,7 @@ abstract class BaseStacker extends BaseFrameworkSystem {
 	 * @param	$forceReInit	Force re-initialization
 	 * @return	void
 	 * @throws	InvalidArgumentException	If a parameter is invalid
-	 * @throws	AlreadyInitializedStackerException	If the stack is already initialized
+	 * @throws	BadMethodCallException	If the stack is already initialized
 	 */
 	public function initStack (string $stackerName, bool $forceReInit = false) {
 		// Validate parameter
@@ -73,8 +73,7 @@ abstract class BaseStacker extends BaseFrameworkSystem {
 			throw new InvalidArgumentException('Parameter "stackerName" is empty');
 		} elseif (($forceReInit === false) && ($this->isStackInitialized($stackerName))) {
 			// Then throw the exception
-			// @TODO Change to BMCE
-			throw new AlreadyInitializedStackerException(array($this, $stackerName, $forceReInit), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
+			throw new BadMethodCallException(array($this, $stackerName, $forceReInit), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
 		}
 
 		// Initialize the given stack and "cache" configuration entry
diff --git a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
index 7275c1b4..7d6dceec 100644
--- a/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
+++ b/framework/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
@@ -1,51 +1,2 @@
 <?php
-// Own namespace
-namespace Org\Mxchange\CoreFramework\Deprecated;
-
-// Import framework stuff
-use Org\Mxchange\CoreFramework\Generic\FrameworkException;
-
-/**
- * Thrown if a stacker is already initialized
- *
- * @author		Roland Haeder <webmaster@shipsimu.org>
- * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2022 Core Developer Team
- * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.shipsimu.org
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General 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/>.
- */
-class AlreadyInitializedStackerException extends FrameworkException {
-	/**
-	 * The super constructor for all exceptions
-	 *
-	 * @param	$messageArray	Error message array
-	 * @param	$code			Error code
-	 * @return	void
-	 */
-	public function __construct (array $messageArray, int $code) {
-		// Construct message
-		$message = sprintf('[%s:%d] Stacker %s already initialized, forceReInit=%d.',
-			$messageArray[0]->__toString(),
-			$this->getLine(),
-			$messageArray[1],
-			intval($messageArray[2])
-		);
-
-		// Call parent exception constructor
-		parent::__construct($message, $code);
-	}
-
-}
+// @DEPRECATED