Changeset 1583 for code/branches/core3/src/core/Identifier.cc

Timestamp:

Jun 10, 2008, 3:01:24 AM (16 years ago)

Author:

landauf

Message:

changed Identifier initialization

File:

• code/branches/core3/src/core/Identifier.cc (modified) (3 diffs)

code/branches/core3/src/core/Identifier.cc

@@ -58 +58 @@
 
         this->bCreatedOneObject_ = false;
+        this->bSetName_ = false;
         this->factory_ = 0;
 
@@ -86 +87 @@
         @return The identifier (unique instance)
     */
-    Identifier *Identifier::getIdentifier(std::string &name, Identifier *proposal)
+    Identifier* Identifier::getIdentifierSingleton(const std::string& name, Identifier* proposal)
     {
         static std::map<std::string, Identifier*> identifiers;    //!< The map to store all Identifiers.
         std::map<std::string, Identifier*>::const_iterator it = identifiers.find(name);
-        if (it == identifiers.end())
-        {
-            // there isn't an entry yet, put the proposal in it
+
+        if (it != identifiers.end())
+        {
+            // There is already an entry: return it and delete the proposal
+            delete proposal;
+            return (*it).second;
+        }
+        else
+        {
+            // There is no entry: put the proposal into the map and return it
             identifiers[name] = proposal;
-        }
-        else
-        {
-            // this happens when a template exists twice --> delete the proposal
-            delete proposal;
-        }
-        return identifiers[name];
+            return proposal;
+        }
     }
 
@@ -149 +152 @@
 
     /**
+        @brief Sets the name of the class.
+        @param name The name
+    */
+    void Identifier::setName(const std::string& name)
+    {
+        if (!this->bSetName_)
+        {
+            this->name_ = name;
+            this->bSetName_ = true;
+            Identifier::getIdentifierMapIntern()[name] = this;
+            Identifier::getLowercaseIdentifierMapIntern()[getLowercase(name)] = this;
+        }
+    }
+
+    /**
         @brief Creates an object of the type the Identifier belongs to.
         @return The new object