Continued:

[core.git] / framework / main / classes / iterator / registry / class_RegistryIterator.php

diff --git a/framework/main/classes/iterator/registry/class_RegistryIterator.php b/framework/main/classes/iterator/registry/class_RegistryIterator.php
index 9c9d0b4a44053849aeb6c5a4e7a6c261f193545e..b0a28dc5a8301405b961ad9370598a497311d568 100644 (file)
--- a/framework/main/classes/iterator/registry/class_RegistryIterator.php
+++ b/framework/main/classes/iterator/registry/class_RegistryIterator.php
@@ -3,12 +3,14 @@
 namespace Org\Mxchange\CoreFramework\Iterator\Registry;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Iterator\BaseIterator;
 use Org\Mxchange\CoreFramework\Registry\Register;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Registry\Sub\SubRegistry;
+use Org\Mxchange\CoreFramework\Traits\Registry\RegisterTrait;
 
 // Import SPL stuff
 use \BadMethodCallException;
@@ -19,7 +21,7 @@ use \LogicException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,6 +39,9 @@ use \LogicException;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class RegistryIterator extends BaseIterator implements IteratableRegistry {
+       // Load traits
+       use RegisterTrait;
+
        /**
         * All found registry keys
         */
@@ -53,17 +58,12 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
         */
        private $key = NULL;
 
-       /**
-        * Registry instance (implementing Register)
-        */
-       private $registryInstance = NULL;
-
        /**
         * Protected constructor
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
@@ -93,25 +93,6 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
                return $iteratorInstance;
        }
 
-       /**
-        * Setter for registry instance
-        *
-        * @param       $registryInstance               An instance of a Register class
-        * @return      void
-        */
-       protected final function setRegistryInstance (Register $registryInstance) {
-               $this->registryInstance = $registryInstance;
-       }
-
-       /**
-        * Getter for registry instance
-        *
-        * @return      $registryInstance       The debug registry instance
-        */
-       protected final function getRegistryInstance () {
-               return $this->registryInstance;
-       }
-
        /**
         * Setter for only-registries array
         *
@@ -143,7 +124,7 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
                if (count($entries) > 0) {
                        // Debugging:
                        /* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: UNFINISHED: entries=%s', __METHOD__, __LINE__, print_r($entries, TRUE)));
-               } // END - if
+               }
 
                // Get instance registry entries from it
                $entries = $this->getRegistryInstance()->getInstanceRegistry();
@@ -204,8 +185,8 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('REGISTRY-ITERATOR[instance]: key=%s - Adding ...', $key));
                                //* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: key=%s,entry=%s', __METHOD__, __LINE__, $key, print_r($entry, TRUE)));
                                array_push($this->registryKeys['instance'], $key);
-                       } // END - foreach
-               } // END - if
+                       }
+               }
 
                // Trace message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('REGISTRY-ITERATOR: EXIT!');