Renamed 'stacker' -> 'stack'

[core.git] / inc / classes / main / stacker / fifo / class_FiFoStacker.php

diff --git a/inc/classes/main/stacker/fifo/class_FiFoStacker.php b/inc/classes/main/stacker/fifo/class_FiFoStacker.php
index fa88aa9943747f2dd8c00ab540f297416a799211..29bcd709f62d9872bda5be3248b1ef2430204ede 100644 (file)
--- a/inc/classes/main/stacker/fifo/class_FiFoStacker.php
+++ b/inc/classes/main/stacker/fifo/class_FiFoStacker.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,12 +37,12 @@ class FiFoStacker extends BaseStacker implements Stackable {
         *
         * @return      $stackerInstance        An instance of FiFoStacker
         */
-       public final static function createFiFoStacker () {
+       public static final function createFiFoStacker () {
                // Get a new instance
                $stackerInstance = new FiFoStacker();
 
                // Init generic stacker
-               $stackerInstance->initStacker('generic');
+               $stackerInstance->initStack('generic');
 
                // Return the prepared instance
                return $stackerInstance;
@@ -57,19 +57,27 @@ class FiFoStacker extends BaseStacker implements Stackable {
         * @throws      StackerFullException    If the stack is full
         */
        public function pushNamed ($stackerName, $value) {
-               $this->partialStub('stackerName=' . $stackerName . ',value[' . gettype($value) . ']=' . $value);
+               // Call the protected method
+               parent::addValue($stackerName, $value);
        }
 
        /**
-        * 'Pops' a value from a named stacker
+        * 'Pops' a value from a named stacker and returns it's value
         *
         * @param       $stackerName    Name of the stack
-        * @return      void
+        * @return      $value                  Value of the current stack entry
         * @throws      NoStackerException      If the named stacker was not found
         * @throws      EmptyStackerException   If the named stacker is empty
         */
        public function popNamed ($stackerName) {
-               $this->partialStub('stackerName=' . $stackerName);
+               // Get the value
+               $value = $this->getNamed($stackerName);
+
+               // Call the protected method
+               parent::popFirst($stackerName);
+
+               // Return the value
+               return $value;
        }
 
        /**
@@ -81,7 +89,8 @@ class FiFoStacker extends BaseStacker implements Stackable {
         * @throws      EmptyStackerException   If the named stacker is empty
         */
        public function getNamed ($stackerName) {
-               $this->partialStub('stackerName=' . $stackerName);
+               // Call the protected method
+               return parent::getFirstValue($stackerName);
        }
 }