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

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.h (modified) (4 diffs)

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

@@ -61 +61 @@
             static Identifier* getIdentifier(const std::string& name);
             static Identifier* getIdentifier(const uint32_t id);
-            static void add(const std::string& name, BaseFactory* factory);
+            static void add(const std::string& name, Identifier* identifier);
             static void changeNetworkID(Identifier* identifier, const uint32_t oldID, const uint32_t newID);
             static void cleanNetworkIDs();
@@ -69 +69 @@
 
             /** @brief Returns the factory-map. */
-            static const std::map<std::string, Identifier*>& getFactoryMap()
+            static const std::map<std::string, Identifier*>& getFacbtoryMap()
                 { return Factory::getFactoryPointer()->identifierStringMap_; }
             /** @brief Returns the begin-iterator of the factory-map. */
@@ -85 +85 @@
             std::map<std::string, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
             std::map<uint32_t, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
-            std::map<std::string, BaseFactory*> factoryMap_;
     };
 
@@ -96 +95 @@
         public:
             virtual BaseObject* fabricate(BaseObject* creator) = 0;
-            virtual Identifier* createIdentifier(const std::string& name) = 0;
             virtual ~BaseFactory() {};
     };