From efb7a8f3216bc0f7bf149ca9f4a3affecce04add Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 24 Mar 2015 21:24:44 +0100
Subject: [PATCH] Moved DefaultIterator to 'core'.
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
application/hub/config.php | 3 -
.../iterator/pool/class_DefaultIterator.php | 122 ------------------
core | 2 +-
3 files changed, 1 insertion(+), 126 deletions(-)
delete mode 100644 application/hub/main/iterator/pool/class_DefaultIterator.php
diff --git a/application/hub/config.php b/application/hub/config.php
index a99f1751c..e718837aa 100644
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -684,9 +684,6 @@ $cfg->setConfigEntry('task_pool_iterator_class', 'TaskPoolIterator');
// CFG: MONITOR-POOL-ITERATOR-CLASS
$cfg->setConfigEntry('monitor_pool_iterator_class', 'MonitorPoolIterator');
-// CFG: DEFAULT-ITERATOR-CLASS
-$cfg->setConfigEntry('default_iterator_class', 'DefaultIterator');
-
// CFG: QUERY-ITERATOR-CLASS
$cfg->setConfigEntry('query_iterator_class', 'DefaultIterator');
diff --git a/application/hub/main/iterator/pool/class_DefaultIterator.php b/application/hub/main/iterator/pool/class_DefaultIterator.php
deleted file mode 100644
index eed631868..000000000
--- a/application/hub/main/iterator/pool/class_DefaultIterator.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * A Default iterator
- *
- * @author Roland Haeder <webmaster@shipsimu.org>
- * @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license GNU GPL 3.0 or any newer version
- * @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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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 {
- /**
- * Key for the global list index
- */
- private $indexKey = 0;
-
- /**
- * Protected constructor
- *
- * @return void
- */
- protected function __construct () {
- // Call parent constructor
- parent::__construct(__CLASS__);
- }
-
- /**
- * Creates an instance of this class
- *
- * @param $listInstance A list of a Listable
- * @return $iteratorInstance An instance a Iterator class
- */
- public static final function createDefaultIterator (Listable $listInstance) {
- // Get new instance
- $iteratorInstance = new DefaultIterator();
-
- // Set the list
- $iteratorInstance->setListInstance($listInstance);
-
- // Return the prepared instance
- return $iteratorInstance;
- }
-
- /**
- * Getter for current value from group or generic
- *
- * @return $current Current value in iteration
- * @throws IndexOutOfBoundsException If $indexKey is out of bounds
- */
- public function current () {
- // Default is null
- $current = NULL;
-
- // Is the entry valid?
- 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());
-
- // Return it
- return $current;
- }
-
- /**
- * Getter for key from group or generic
- *
- * @return $indexKey Current key in iteration
- */
- public function key () {
- return $this->indexKey;
- }
-
- /**
- * Advances to the next entry
- *
- * @return void
- */
- public function next () {
- $this->indexKey++;
- }
-
- /**
- * Rewinds to the beginning of the iteration
- *
- * @return void
- */
- public function rewind () {
- $this->indexKey = 0;
- }
-
- /**
- * Checks whether the current entry is valid (not at the end of the list)
- *
- * @return $isValid Whether the current entry is there
- */
- public function valid () {
- // Check for total active peers and if we are not at the end
- $isValid = ($this->key() < $this->getListInstance()->count());
-
- // Return result
- return $isValid;
- }
-}
-
-// [EOF]
-?>
diff --git a/core b/core
index b50e501ba..7384b77ce 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b50e501ba479d6cc85727af5ae7014c7d29c2c63
+Subproject commit 7384b77cecad873dc0abba61365ed844373a8b51
--
2.39.5