createUniqueID -> generateUniqueId renamed, dataset criteria added, registration...

[shipsimu.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 0ceda2c0c4016ebd04830884fd93aff9770d1ecf..a9e1a2a723ab9b93cfccb5f0d384c67663479a8e 100644 (file)
--- a/inc/classes/main/registry/class_Registry.php
+++ b/inc/classes/main/registry/class_Registry.php
@@ -45,7 +45,7 @@ class Registry extends BaseFrameworkSystem implements Register {
                $this->setObjectDescription("Registry class");
 
                // Create unique ID number
-               $this->createUniqueID();
+               $this->generateUniqueId();
 
                // Clean up a little
                $this->removeNumberFormaters();
@@ -57,7 +57,7 @@ class Registry extends BaseFrameworkSystem implements Register {
         *
         * @return      $selfInstance   Instance of this class
         */
-       public final static function getInstance () {
+       public final static function getRegistry () {
                // Is an instance there?
                if (is_null(self::$selfInstance)) {
                        // Not yet, so create one
@@ -92,6 +92,25 @@ class Registry extends BaseFrameworkSystem implements Register {
        public function addInstance ($instanceKey, Registerable $objectInstance) {
                $this->instanceRegistry[$instanceKey] = $objectInstance;
        }
+
+       /**
+        * Gets a registered instance or null if not found
+        *
+        * @param       $instanceKey            The key to identify the instance
+        * @return      $objectInstance         An instance we shall store
+        */
+       public function getInstance ($instanceKey) {
+               // By default the instance is not in the registry
+               $objectInstance = null;
+
+               // Is the instance there?
+               if ($this->instanceExists($instanceKey)) {
+                       $objectInstance = $this->instanceRegistry[$instanceKey];
+               }
+
+               // Return the result
+               return $objectInstance;
+       }
 }
 
 // [EOF]