Changeset 5611 for code/branches/resource2/src/core/Factory.cc

Timestamp:

Aug 5, 2009, 5:20:06 PM (15 years ago)

Author:

rgrieder

Message:

Stupid TSVN bug: All items in a commit list are always checked by default (which is exactly wrong). It was fixed again in the upcoming 1.6.4 version though.

File:

• code/branches/resource2/src/core/Factory.cc (modified) (2 diffs)

code/branches/resource2/src/core/Factory.cc

@@ -73 +73 @@
         @param identifier The identifier to add
     */
-    void Factory::add(const std::string& name, BaseFactory* factory)
+    void Factory::add(const std::string& name, Identifier* identifier)
     {
-        getFactoryPointer()->factoryMap_[name] = factory;
+        getFactoryPointer()->identifierStringMap_[name] = identifier;
+        getFactoryPointer()->identifierNetworkIDMap_[identifier->getNetworkID()] = identifier;
     }
 
@@ -104 +105 @@
     {
         COUT(3) << "*** Factory: Create class-hierarchy" << std::endl;
-        std::map<std::string, BaseFactory*>::iterator it;
-        it = getFactoryPointer()->factoryMap_.begin();
-        Identifier::startCreatingHierarchy();
-        for (it = getFactoryPointer()->factoryMap_.begin(); it != getFactoryPointer()->factoryMap_.end(); ++it)
+        std::map<std::string, Identifier*>::iterator it;
+        it = getFactoryPointer()->identifierStringMap_.begin();
+        (*getFactoryPointer()->identifierStringMap_.begin()).second->startCreatingHierarchy();
+        for (it = getFactoryPointer()->identifierStringMap_.begin(); it != getFactoryPointer()->identifierStringMap_.end(); ++it)
         {
-            // Create the corresponding identifier first
-            Identifier* identifier = it->second->createIdentifier(it->first);
-            getFactoryPointer()->identifierStringMap_[it->first] = identifier;
-            getFactoryPointer()->identifierNetworkIDMap_[identifier->getNetworkID()] = identifier;
             // To create the new branch of the class-hierarchy, we create a new object and delete it afterwards.
-            BaseObject* temp = identifier->fabricate(0);
+            BaseObject* temp = (*it).second->fabricate(0);
             delete temp;
         }
-        Identifier::stopCreatingHierarchy();
+        (*getFactoryPointer()->identifierStringMap_.begin()).second->stopCreatingHierarchy();
         COUT(3) << "*** Factory: Finished class-hierarchy creation" << std::endl;
     }