From 4fbcdb435270b88c8f97e69e987cb40712e74ce4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 25 Jul 2013 01:14:57 +0000 Subject: [PATCH 1/1] Renamed 'stacker' -> 'stack' --- inc/classes/main/stacker/class_ | 2 +- inc/classes/main/stacker/class_BaseStacker.php | 10 +++++----- inc/classes/main/stacker/fifo/class_FiFoStacker.php | 2 +- inc/classes/main/stacker/filo/class_FiLoStacker.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inc/classes/main/stacker/class_ b/inc/classes/main/stacker/class_ index 423701cf..ff8387b2 100644 --- a/inc/classes/main/stacker/class_ +++ b/inc/classes/main/stacker/class_ @@ -43,7 +43,7 @@ class ???Stacker extends BaseStacker implements Stackable { $stackerInstance = new ???Stacker(); // Init generic stacker - $stackerInstance->initStacker('generic'); + $stackerInstance->initStack('generic'); // Return the prepared instance return $stackerInstance; diff --git a/inc/classes/main/stacker/class_BaseStacker.php b/inc/classes/main/stacker/class_BaseStacker.php index 55b28a6d..12cfc031 100644 --- a/inc/classes/main/stacker/class_BaseStacker.php +++ b/inc/classes/main/stacker/class_BaseStacker.php @@ -47,7 +47,7 @@ class BaseStacker extends BaseFrameworkSystem { * @return void * @throws AlreadyInitializedStackerException If the stack is already initialized */ - public final function initStacker ($stackerName, $forceReInit = FALSE) { + public final function initStack ($stackerName, $forceReInit = FALSE) { // Is the stack already initialized? if (($forceReInit === FALSE) && ($this->isStackInitialized($stackerName))) { // Then throw the exception @@ -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 } @@ -160,7 +160,7 @@ class BaseStacker extends BaseFrameworkSystem { // 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); diff --git a/inc/classes/main/stacker/fifo/class_FiFoStacker.php b/inc/classes/main/stacker/fifo/class_FiFoStacker.php index 237c3d3e..29bcd709 100644 --- a/inc/classes/main/stacker/fifo/class_FiFoStacker.php +++ b/inc/classes/main/stacker/fifo/class_FiFoStacker.php @@ -42,7 +42,7 @@ class FiFoStacker extends BaseStacker implements Stackable { $stackerInstance = new FiFoStacker(); // Init generic stacker - $stackerInstance->initStacker('generic'); + $stackerInstance->initStack('generic'); // Return the prepared instance return $stackerInstance; diff --git a/inc/classes/main/stacker/filo/class_FiLoStacker.php b/inc/classes/main/stacker/filo/class_FiLoStacker.php index de191dc1..a2920fa6 100644 --- a/inc/classes/main/stacker/filo/class_FiLoStacker.php +++ b/inc/classes/main/stacker/filo/class_FiLoStacker.php @@ -42,7 +42,7 @@ class FiLoStacker extends BaseStacker implements Stackable { $stackerInstance = new FiLoStacker(); // Init the generic stacker - $stackerInstance->initStacker('generic'); + $stackerInstance->initStack('generic'); // Return the prepared instance return $stackerInstance; -- 2.30.2