Changeset 10481 for code/branches/core7/src

Timestamp:

May 25, 2015, 9:40:11 PM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedIdentifier is now responsible to register and unregister the assigned identifier.

Location:

code/branches/core7/src/libraries/core

Files:

• CoreIncludes.h (modified) (3 diffs)
• class/IdentifierManager.cc (modified) (1 diff)
• class/IdentifierManager.h (modified) (1 diff)
• singleton/ScopedSingletonIncludes.h (modified) (1 diff)

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -167 +167 @@
     inline Identifier* registerClass(const std::string& name, Factory* factory, bool bLoadable = true)
     {
-        Identifier* identifier = new ClassIdentifier<T>(name, factory, bLoadable);
-        IdentifierManager::getInstance().addIdentifier(identifier);
-        return identifier;
+        return new ClassIdentifier<T>(name, factory, bLoadable);
     }
 
@@ -242 +240 @@
             virtual void load()
             {
+                IdentifierManager::getInstance().addIdentifier(this->identifier_);
                 for (size_t i = 0; i < this->parents_.size(); ++i)
                     this->identifier_->inheritsFrom(this->parents_[i]->getParent());
@@ -248 +247 @@
             virtual void unload()
             {
+                IdentifierManager::getInstance().removeIdentifier(this->identifier_);
             }
 

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -68 +68 @@
         this->identifierByLowercaseString_[getLowercase(identifier->getName())] = identifier;
         this->identifierByNetworkId_[identifier->getNetworkID()] = identifier;
+    }
+
+    /**
+     * Unregisters the identifier from all maps of the IdentifierManager.
+     */
+    void IdentifierManager::removeIdentifier(Identifier* identifier)
+    {
+        this->identifiers_.erase(identifier);
+        this->identifierByString_.erase(identifier->getName());
+        this->identifierByLowercaseString_.erase(getLowercase(identifier->getName()));
+        this->identifierByNetworkId_.erase(identifier->getNetworkID());
     }
 

code/branches/core7/src/libraries/core/class/IdentifierManager.h

@@ -50 +50 @@
 
             void addIdentifier(Identifier* identifier);
+            void removeIdentifier(Identifier* identifier);
 
             unsigned int getUniqueClassId()

code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -77 +77 @@
 namespace orxonox
 {
-
     class _CoreExport StaticallyInitializedScopedSingletonWrapper : public StaticallyInitializedInstance
     {