Continued:

[core.git] / framework / main / classes / iterator / default / class_DefaultIterator.php

diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php
index f48cc66b645a937e32be86d55f0604b49edba155..ba05b58b23b7fd77d8c61e4830cfd5515933e7b8 100644 (file)
--- a/framework/main/classes/iterator/default/class_DefaultIterator.php
+++ b/framework/main/classes/iterator/default/class_DefaultIterator.php
@@ -1,16 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Iterator;
+namespace Org\Mxchange\CoreFramework\Iterator;
 
 // Import framework stuff
-use CoreFramework\Lists\Listable;
+use Org\Mxchange\CoreFramework\Iterator\BaseIterator;
+use Org\Mxchange\CoreFramework\Lists\Listable;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+
+// Import SPL stuff
+use \Iterator;
 
 /**
  * A Default iterator
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -27,7 +32,7 @@ use CoreFramework\Lists\Listable;
  * 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 DefaultIterator extends BaseIterator implements Iterator {
+class DefaultIterator extends BaseIterator implements Iterator, Registerable {
        /**
         * Key for the global list index
         */
@@ -38,7 +43,7 @@ class DefaultIterator extends BaseIterator implements Iterator {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -74,10 +79,10 @@ class DefaultIterator extends BaseIterator implements Iterator {
                if (!$this->valid()) {
                        // Throw an exception here
                        throw new IndexOutOfBoundsException($this->key(), self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
-               } // END - if
+               }
 
                // Now get the entry
-               $current = $this->getListInstance()->getEntry($this->key());
+               $current = $this->getListInstance()->getEntryByIndex($this->key());
 
                // Return it
                return $current;