From e9bd3cb9c11e70448817604a7efff7564f2860d4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Jun 2014 22:48:24 +0200 Subject: [PATCH 1/1] Renamed 'stacker' to 'stack' as they are stacks (FiFo and "FiLo"). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../main/class_BaseFrameworkSystem.php | 14 +-- inc/classes/main/stacker/class_ | 8 +- .../main/stacker/fifo/class_FiFoStacker.php | 8 +- .../main/stacker/filo/class_FiLoStacker.php | 8 +- .../menu/class_MenuTemplateEngine.php | 86 +++++++++---------- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 02e04fe1..40bb94e0 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -116,7 +116,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Instance of the stacker */ - private $stackerInstance = NULL; + private $stackInstance = NULL; /** * A Compressor instance @@ -953,20 +953,20 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { /** * Setter for stacker instance * - * @param $stackerInstance An instance of an stacker + * @param $stackInstance An instance of an stacker * @return void */ - public final function setStackerInstance (Stackable $stackerInstance) { - $this->stackerInstance = $stackerInstance; + public final function setStackInstance (Stackable $stackInstance) { + $this->stackInstance = $stackInstance; } /** * Getter for stacker instance * - * @return $stackerInstance An instance of an stacker + * @return $stackInstance An instance of an stacker */ - public final function getStackerInstance () { - return $this->stackerInstance; + public final function getStackInstance () { + return $this->stackInstance; } /** diff --git a/inc/classes/main/stacker/class_ b/inc/classes/main/stacker/class_ index ff8387b2..87bbaf6e 100644 --- a/inc/classes/main/stacker/class_ +++ b/inc/classes/main/stacker/class_ @@ -36,17 +36,17 @@ class ???Stacker extends BaseStacker implements Stackable { * Creates an instance of the class Stacker and prepares it for usage * * @param $appInstance A manageable application - * @return $stackerInstance An instance of ???Stacker + * @return $stackInstance An instance of ???Stacker */ public final static function create???Stacker (ManageableApplication $appInstance) { // Get a new instance - $stackerInstance = new ???Stacker(); + $stackInstance = new ???Stacker(); // Init generic stacker - $stackerInstance->initStack('generic'); + $stackInstance->initStack('generic'); // Return the prepared instance - return $stackerInstance; + return $stackInstance; } /** diff --git a/inc/classes/main/stacker/fifo/class_FiFoStacker.php b/inc/classes/main/stacker/fifo/class_FiFoStacker.php index 579b65f1..478290be 100644 --- a/inc/classes/main/stacker/fifo/class_FiFoStacker.php +++ b/inc/classes/main/stacker/fifo/class_FiFoStacker.php @@ -35,17 +35,17 @@ class FiFoStacker extends BaseStacker implements Stackable { /** * Creates an instance of the class Stacker and prepares it for usage * - * @return $stackerInstance An instance of FiFoStacker + * @return $stackInstance An instance of FiFoStacker */ public static final function createFiFoStacker () { // Get a new instance - $stackerInstance = new FiFoStacker(); + $stackInstance = new FiFoStacker(); // Init generic stacker - $stackerInstance->initStack('generic'); + $stackInstance->initStack('generic'); // Return the prepared instance - return $stackerInstance; + return $stackInstance; } /** diff --git a/inc/classes/main/stacker/filo/class_FiLoStacker.php b/inc/classes/main/stacker/filo/class_FiLoStacker.php index b4789e65..7b42ad2e 100644 --- a/inc/classes/main/stacker/filo/class_FiLoStacker.php +++ b/inc/classes/main/stacker/filo/class_FiLoStacker.php @@ -35,17 +35,17 @@ class FiLoStacker extends BaseStacker implements Stackable { /** * Creates an instance of the class Stacker and prepares it for usage * - * @return $stackerInstance An instance of FiLoStacker + * @return $stackInstance An instance of FiLoStacker */ public static final function createFiLoStacker () { // Get a new instance - $stackerInstance = new FiLoStacker(); + $stackInstance = new FiLoStacker(); // Init the generic stacker - $stackerInstance->initStack('generic'); + $stackInstance->initStack('generic'); // Return the prepared instance - return $stackerInstance; + return $stackInstance; } /** diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php index 52ca8910..29301659 100644 --- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php +++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php @@ -133,10 +133,10 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla $templateInstance->setMenuInstance($menuInstance); // Init a variable stacker - $stackerInstance = ObjectFactory::createObjectByConfiguredName('menu_stacker_class'); + $stackInstance = ObjectFactory::createObjectByConfiguredName('menu_stacker_class'); // Set it - $templateInstance->setStackerInstance($stackerInstance); + $templateInstance->setStackInstance($stackInstance); // Return the prepared instance return $templateInstance; @@ -278,7 +278,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla // Assign the found characters to variable and use the last entry from // stack as the name - parent::assignVariable($this->getStackerInstance()->getNamed('current_node'), $characters); + parent::assignVariable($this->getStackInstance()->getNamed('current_node'), $characters); } /** @@ -320,7 +320,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla $this->handleTemplateDependency('menu', $templateDependency); // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'menu'); + $this->getStackInstance()->pushNamed('current_node', 'menu'); } /** @@ -331,7 +331,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startEntryList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'entry-list'); + $this->getStackInstance()->pushNamed('current_node', 'entry-list'); } /** @@ -341,7 +341,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startBlockHeader () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'block-header'); + $this->getStackInstance()->pushNamed('current_node', 'block-header'); } /** @@ -351,7 +351,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startBlockFooter () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'block-footer'); + $this->getStackInstance()->pushNamed('current_node', 'block-footer'); } /** @@ -361,7 +361,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startBlockList () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'block-list'); + $this->getStackInstance()->pushNamed('current_node', 'block-list'); } /** @@ -371,7 +371,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startBlock () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'block'); + $this->getStackInstance()->pushNamed('current_node', 'block'); } /** @@ -381,7 +381,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startTitle () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'title'); + $this->getStackInstance()->pushNamed('current_node', 'title'); } /** @@ -391,7 +391,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startTitleId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'title-id'); + $this->getStackInstance()->pushNamed('current_node', 'title-id'); } /** @@ -401,7 +401,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startTitleClass () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'title-class'); + $this->getStackInstance()->pushNamed('current_node', 'title-class'); } /** @@ -411,7 +411,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startTitleText () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'title-text'); + $this->getStackInstance()->pushNamed('current_node', 'title-text'); } /** @@ -421,7 +421,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startEntry () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'entry'); + $this->getStackInstance()->pushNamed('current_node', 'entry'); } /** @@ -431,7 +431,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startEntryId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'entry-id'); + $this->getStackInstance()->pushNamed('current_node', 'entry-id'); } /** @@ -441,7 +441,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startAnchor () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'anchor'); + $this->getStackInstance()->pushNamed('current_node', 'anchor'); } /** @@ -451,7 +451,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startAnchorId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'anchor-id'); + $this->getStackInstance()->pushNamed('current_node', 'anchor-id'); } /** @@ -461,7 +461,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startAnchorText () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'anchor-text'); + $this->getStackInstance()->pushNamed('current_node', 'anchor-text'); } /** @@ -471,7 +471,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startAnchorTitle () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'anchor-title'); + $this->getStackInstance()->pushNamed('current_node', 'anchor-title'); } /** @@ -481,7 +481,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startAnchorHref () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'anchor-href'); + $this->getStackInstance()->pushNamed('current_node', 'anchor-href'); } /** @@ -491,7 +491,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startFooterId () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'footer-id'); + $this->getStackInstance()->pushNamed('current_node', 'footer-id'); } /** @@ -501,7 +501,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startFooterClass () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'footer-class'); + $this->getStackInstance()->pushNamed('current_node', 'footer-class'); } /** @@ -511,7 +511,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function startFooterText () { // Push the node name on the stacker - $this->getStackerInstance()->pushNamed('current_node', 'footer-text'); + $this->getStackInstance()->pushNamed('current_node', 'footer-text'); } /** @@ -521,7 +521,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishTitle () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -531,7 +531,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishTitleId () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -541,7 +541,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishTitleClass () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -551,7 +551,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishTitleText () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -561,7 +561,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishFooterText () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -571,7 +571,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishFooterClass () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -581,7 +581,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishFooterId () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -591,7 +591,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishAnchorHref () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -601,7 +601,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishAnchorTitle () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -611,7 +611,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishAnchorText () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -621,7 +621,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishAnchorId () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -631,7 +631,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishAnchor () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -641,7 +641,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishEntryId () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -651,7 +651,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishEntry () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -661,7 +661,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishBlock () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -671,7 +671,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishBlockList () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -681,7 +681,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishEntryList () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -691,7 +691,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishBlockHeader () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -701,7 +701,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishBlockFooter () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** @@ -711,7 +711,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function finishMenu () { // Pop the last entry - $this->getStackerInstance()->popNamed('current_node'); + $this->getStackInstance()->popNamed('current_node'); } /** -- 2.30.2