Fixes and double->single converted
[core.git] / inc / classes / main / registry / class_BaseRegistry.php
index c9a8090..df0f979 100644 (file)
@@ -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,14 +86,8 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public final function addEntry ($key, $value) {
-               // Is the array there?
-               if (!isset($this->rawEntries[$key])) {
-                       // Then intialize it here
-                       $this->rawEntries[$key] = array();
-               } // END - if
-
-               // Simply add it
-               array_push($this->rawEntries[$key], $value);
+               // Push it
+               $this->pushValueToGenericArrayElement('raw', 'generic', $key, $value);
        }
 
        /**
@@ -113,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)) && (isset($this->rawEntries[$key]))) {
+               if (!is_null($key)) {
                        // Then use this entry
-                       $entries = $this->rawEntries[$key];
+                       $entries = $this->getGenericArrayKey('raw', 'generic', $key);
                } // END - if
 
                // Return the array
@@ -182,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;