Fixes and double->single converted

[core.git] / inc / classes / main / registry / class_BaseRegistry.php

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index e16ded285d03062011f626211db1ef56eb5b1cac..df0f9798fdf75a2d070da93182b4dc016397356b 100644 (file)
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -32,16 +32,6 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         */
        private static $registryInstance = NULL;
 
-       /**
-        * Instance registry
-        */
-       private $instanceRegistry = array();
-
-       /**
-        * Raw data entries (non-objects)
-        */
-       private $rawEntries = array();
-
        /**
         * Protected constructor
         *
@@ -61,7 +51,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         */
        public function instanceExists ($instanceKey) {
                // Does this key exists?
-               $exists = (isset($this->instanceRegistry[$instanceKey]));
+               $exists = $this->isGenericArrayKeySet('registry', 'instance', $instanceKey);
 
                // Return the result
                return $exists;
@@ -75,7 +65,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public function addInstance ($instanceKey, Registerable $objectInstance) {
-               $this->instanceRegistry[$instanceKey] = $objectInstance;
+               $this->pushValueToGenericArrayElement('registry', 'instance', $instanceKey, $objectInstance);
        }
 
        /**
@@ -84,7 +74,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      $instanceRegistry       The whole instance registry array
         */
        public final function getInstanceRegistry () {
-               return $this->instanceRegistry;
+               return $this->getGenericSubArray('registry', 'instance');
        }
 
        /**
@@ -96,8 +86,8 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public final function addEntry ($key, $value) {
-               // Simply add it
-               $this->rawEntries[$key][] = $value;
+               // Push it
+               $this->pushValueToGenericArrayElement('raw', 'generic', $key, $value);
        }
 
        /**
@@ -107,12 +97,12 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         */
        public final function getEntries ($key = NULL) {
                // Default is whole array
-               $entries = $this->rawEntries;
+               $entries = $this->getGenericArray('raw');
 
                // Is $key set?
                if (!is_null($key)) {
                        // Then use this entry
-                       $entries = $this->rawEntries[$key];
+                       $entries = $this->getGenericArrayKey('raw', 'generic', $key);
                } // END - if
 
                // Return the array
@@ -133,19 +123,19 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
                // "Walk" over all entries
                foreach ($this->getEntries($arrayKey) as $key => $value) {
                        // Debug message
-                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
 
                        // If $value matches the $lookFor, we need to look for more entries for this!
                        if ($lookFor == $value) {
                                // Look for more entries
                                foreach ($this->getEntries() as $key2 => $value2) {
                                        // Debug message
-                                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
+                                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
 
                                        // Both keys must match!
                                        if (($key == $key2) || (isset($value2[$key]))) {
                                                // Debug message
-                                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+                                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
 
                                                // Then add it
                                                $entry[$key2] = $value2[$key];
@@ -176,7 +166,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
                } // END - if
 
                // Get the instance
-               $objectInstance = $this->instanceRegistry[$instanceKey];
+               $objectInstance = $this->getGenericArrayKey('registry', 'instance', $instanceKey);
 
                // Return the result
                return $objectInstance;