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 84b6d63ba7a7971ecd8a6487d00f8c35f6852a6b..df0f9798fdf75a2d070da93182b4dc016397356b 100644 (file)
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -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
@@ -122,29 +112,30 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
        /**
         * "Getter" for an array of all entries for given key
         *
+        * @param       $arrayKey       The array (key) to look in
         * @param       $lookFor        The key to look for
         * @return      $entry          An array with all keys
         */
-       public function getArrayFromKey ($lookFor) {
+       public function getArrayFromKey ($arrayKey, $lookFor) {
                // Init array
                $entry = array();
 
                // "Walk" over all entries
-               foreach ($this->getEntries('object-name') as $key=>$value) {
+               foreach ($this->getEntries($arrayKey) as $key => $value) {
                        // Debug message
-                       //* DEBUG: */ $this->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) {
+                               foreach ($this->getEntries() as $key2 => $value2) {
                                        // Debug message
-                                       //* DEBUG: */ $this->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: */ $this->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+                                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
 
                                                // Then add it
                                                $entry[$key2] = $value2[$key];
@@ -168,20 +159,15 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
         * @throws      NullPointerException    If the requested key is not found
         */
        public function getInstance ($instanceKey) {
-               // By default the instance is not in registry
-               $objectInstance = NULL;
-
                // Is the instance there?
-               if ($this->instanceExists($instanceKey)) {
-                       $objectInstance = $this->instanceRegistry[$instanceKey];
-               } // END - if
-
-               // Still not fetched?
-               if (is_null($objectInstance)) {
+               if (!$this->instanceExists($instanceKey)) {
                        // This might happen if a non-registered key was requested
                        throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                } // END - if
 
+               // Get the instance
+               $objectInstance = $this->getGenericArrayKey('registry', 'instance', $instanceKey);
+
                // Return the result
                return $objectInstance;
        }