X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fstacker%2Fclass_BaseStacker.php;h=0deeeda2a6c43acacf5ba8e1686610b6aeef736f;hb=de4993bdd2170972f3c004bf7473bfd2032c2dda;hp=e329f60059a311da7eb1f31b00f7e0f46fe27681;hpb=8e6b15818d226f36bc57cc4e04448b262863bca9;p=core.git

diff --git a/inc/classes/main/stacker/class_BaseStacker.php b/inc/classes/main/stacker/class_BaseStacker.php
index e329f600..0deeeda2 100644
--- a/inc/classes/main/stacker/class_BaseStacker.php
+++ b/inc/classes/main/stacker/class_BaseStacker.php
@@ -2,11 +2,11 @@
 /**
  * A general Stacker
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @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
@@ -47,11 +47,11 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @return	void
 	 * @throws	AlreadyInitializedStackerException	If the stack is already initialized
 	 */
-	public final function initStacker ($stackerName, $forceReInit = FALSE) {
+	public function initStack ($stackerName, $forceReInit = FALSE) {
 		// Is the stack already initialized?
 		if (($forceReInit === FALSE) && ($this->isStackInitialized($stackerName))) {
 			// Then throw the exception
-			throw new AlreadyInitializedStackerException(array($this, $stackerName), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
+			throw new AlreadyInitializedStackerException(array($this, $stackerName, $forceReInit), self::EXCEPTION_STACKER_ALREADY_INITIALIZED);
 		} // END - if
 
 		// Initialize the given stack
@@ -59,15 +59,15 @@ class BaseStacker extends BaseFrameworkSystem {
 	}
 
 	/**
-	 * Initializes all stackers
+	 * Initializes all stacks
 	 *
 	 * @return	void
 	 */
-	public function initStackers (array $stacks) {
+	public function initStacks (array $stacks, $forceReInit = FALSE) {
 		// "Walk" through all (more will be added as needed
 		foreach ($stacks as $stackerName) {
 			// Init this stack
-			$this->initStacker($stackerName);
+			$this->initStack($stackerName, $forceReInit);
 		} // END - foreach
 	}
 
@@ -77,7 +77,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @param	$stackerName	Name of the stack
 	 * @return	$isInitialized	Whether the stack is initialized
 	 */
-	public final function isStackInitialized ($stackerName) {
+	public function isStackInitialized ($stackerName) {
 		// Is is there?
 		$isInitialized = ($this->isValidGenericArrayKey('stacks', $stackerName, 'entries'));
 
@@ -92,7 +92,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @return	$isFull			Whether the stack is full
 	 * @throws	NoStackerException	If given stack is missing
 	 */
-	protected final function isStackFull ($stackerName) {
+	protected function isStackFull ($stackerName) {
 		// Is the stack not yet initialized?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -113,7 +113,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @return	$isEmpty			Whether the stack is empty
 	 * @throws	NoStackerException	If given stack is missing
 	 */
-	public final function isStackEmpty ($stackerName) {
+	public function isStackEmpty ($stackerName) {
 		// Is the stack not yet initialized?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -134,7 +134,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @return	$count			Size of stack (array count)
 	 * @throws	NoStackerException	If given stack is missing
 	 */
-	public final function getStackCount ($stackerName) {
+	public function getStackCount ($stackerName) {
 		// Is the stack not yet initialized?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -156,11 +156,11 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @return	void
 	 * @throws	FullStackerException	Thrown if the stack is full
 	 */
-	protected final function addValue ($stackerName, $value) {
+	protected function addValue ($stackerName, $value) {
 		// Is the stack not yet initialized or full?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Then do it here
-			$this->initStacker($stackerName);
+			$this->initStack($stackerName);
 		} elseif ($this->isStackFull($stackerName)) {
 			// Stacker is full
 			throw new FullStackerException(array($this, $stackerName, $value), self::EXCEPTION_STACKER_IS_FULL);
@@ -178,7 +178,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @throws	NoStackerException	If the named stacker was not found
 	 * @throws	EmptyStackerException	If the named stacker is empty
 	 */
-	protected final function getLastValue ($stackerName) {
+	protected function getLastValue ($stackerName) {
 		// Is the stack not yet initialized or full?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -203,7 +203,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @throws	NoStackerException	If the named stacker was not found
 	 * @throws	EmptyStackerException	If the named stacker is empty
 	 */
-	protected final function getFirstValue ($stackerName) {
+	protected function getFirstValue ($stackerName) {
 		// Is the stack not yet initialized or full?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -228,7 +228,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @throws	NoStackerException	If the named stacker was not found
 	 * @throws	EmptyStackerException	If the named stacker is empty
 	 */
-	protected final function popLast ($stackerName) {
+	protected function popLast ($stackerName) {
 		// Is the stack not yet initialized or full?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception
@@ -250,7 +250,7 @@ class BaseStacker extends BaseFrameworkSystem {
 	 * @throws	NoStackerException	If the named stacker was not found
 	 * @throws	EmptyStackerException	If the named stacker is empty
 	 */
-	protected final function popFirst ($stackerName) {
+	protected function popFirst ($stackerName) {
 		// Is the stack not yet initialized or full?
 		if (!$this->isStackInitialized($stackerName)) {
 			// Throw an exception