FIFO basicly finished

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

diff --git a/inc/classes/main/registry/class_Registry.php b/inc/classes/main/registry/class_Registry.php
index 075432c05ff10bfef6fbdb966db99a7c719b885b..a31415b34bb39f2845b9130a491cb425d8926b76 100644 (file)
--- a/inc/classes/main/registry/class_Registry.php
+++ b/inc/classes/main/registry/class_Registry.php
@@ -5,7 +5,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -28,11 +28,6 @@ class Registry extends BaseFrameworkSystem implements Register {
         */
        private static $registryInstance = null;
 
-       /**
-        * Wether the registry is initialized
-        */
-       private static $initialized = false;
-
        /**
         * Instance registry
         */
@@ -46,10 +41,6 @@ class Registry extends BaseFrameworkSystem implements Register {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -69,26 +60,6 @@ class Registry extends BaseFrameworkSystem implements Register {
                return self::$registryInstance;
        }
 
-       /**
-        * Checks or sets wether the registry has been initialized. This had only
-        * be done once.
-        *
-        * @param       $initialized    Wether the registry is initialized
-        * @return      $initialized    Wether the registry is initialized
-        */
-       public final static function isInitialized ($initialized = null) {
-               // If no parameter (null by default) is provided we want to get the
-               // parameter. If set to e.g. 'OK' then the registry is set to
-               // "initialized".
-               if (is_null($initialized)) {
-                       // Get status if initialized
-                       return self::$initialized;
-               } else {
-                       // Registry is initialized!
-                       self::$initialized = true;
-               }
-       }
-
        /**
         * Checks wether an instance key was found
         *
@@ -119,6 +90,7 @@ class Registry extends BaseFrameworkSystem implements Register {
         *
         * @param       $instanceKey            The key to identify the instance
         * @return      $objectInstance         An instance we shall store
+        * @throws      NullPointerException    If the requested key is not found
         */
        public function getInstance ($instanceKey) {
                // By default the instance is not in registry
@@ -129,6 +101,12 @@ class Registry extends BaseFrameworkSystem implements Register {
                        $objectInstance = $this->instanceRegistry[$instanceKey];
                } // END - if
 
+               // Still not fetched?
+               if (is_null($objectInstance)) {
+                       // This might happen if a non-registered key was requested
+                       throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+               } // END - if
+
                // Return the result
                return $objectInstance;
        }