Changeset 9762 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/factory.h

Timestamp:

Sep 19, 2006, 5:00:10 PM (18 years ago)

Author:

bensch

Message:

new_class_id: much faster and nicer self-cleaning Factory

File:

• branches/new_class_id/src/lib/util/loading/factory.h (modified) (5 diffs)

branches/new_class_id/src/lib/util/loading/factory.h

@@ -27 +27 @@
 #include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
-#include <list>
+#include <map>
 
 /**
@@ -34 +34 @@
  */
 #define CREATE_FACTORY(CLASS_NAME) \
-    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::staticClassID())
+    tFactory<CLASS_NAME> global_##CLASS_NAME##_Factory = tFactory<CLASS_NAME>(CLASS_NAME::staticClassID())
 
 //! The Factory is a loadable object handler
 class Factory : public BaseObject
 {
+  //! Declare the ObjectList at the BaseObject List
   ObjectListDeclaration(Factory);
 public:
   virtual ~Factory ();
-
-  static void deleteFactories();
 
   static  BaseObject* fabricate(const std::string& className);
@@ -49 +48 @@
   static  BaseObject* fabricate(const TiXmlElement* root);
 
-
   bool operator==(int classID) const;
   bool operator==(const std::string& className) const;
+  /** @param classID the ID to compare @returns true if the ID's match */
   bool operator==(const ClassID& classID) const { return _classID == classID; };
+
+
+  void debug() const;
+  static void debugAll();
 
 protected:
   Factory (const ClassID& id);
+  /**
+   * @brief The core function of the Factory. Creates objects of the Factories Type.
+   * @param root The TiXmlElement of the Factory.
+   * @returns the created Object in BaseType* format.
+   */
   virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 
 private:
+  //! Copy Constructor is hidden.
   Factory (const Factory&) {};
 
 protected:
-  const ClassID              _classID;              //!< The Class-Identifyer of the Factory.
-  static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
+  /** The Type of the FactoryMap that is sorted by ID */
+  typedef std::map<const ClassID, Factory*>  FactoryIDMap;
+  /** The Type of the FactoryMap that is sorted by Name */
+  typedef std::map<std::string, Factory*>    FactoryStringMap;
+
+  const ClassID                 _classID;              //!< The Class-Identifyer of the Factory.
+  static FactoryIDMap           _factoryIDMap;         //!< List of Registered Factories
+  static FactoryStringMap       _factoryStringMap;     //!< List of Registered Factories
 };
 
@@ -75 +90 @@
   /**
    * @brief creates a new type Factory to enable the loading of T
-   * @param factoryName the Name of the Factory to load.
    * @param classID the ID of the Class to be created.
    */
@@ -81 +95 @@
       : Factory(classID)
   {  }
+  /**
+   * @brief copy constructor
+   * @param factory the Factory to copy
+   */
+  tFactory (const tFactory& factory) : Factory(factory._classID) {};
 
-private:
-  tFactory (const tFactory&) {};
   /**
    * @brief fabricates an Object of type T, with the constructor T::T(const TiXmlElemnt*)