Changeset 5779

Timestamp:

Sep 24, 2009, 2:55:34 AM (15 years ago)

Author:

landauf

Message:

Renamed BaseFactory as Factory
Added function ClassByLowercaseString

Location:

code/branches/core5/src/libraries/core

Files:

• ClassFactory.h (modified) (2 diffs)
• CoreIncludes.h (modified) (4 diffs)
• CorePrereqs.h (modified) (1 diff)
• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (3 diffs)

code/branches/core5/src/libraries/core/ClassFactory.h

@@ -46 +46 @@
 namespace orxonox
 {
-    // ###############################
-    // ###       BaseFactory       ###
-    // ###############################
+    // ###########################
+    // ###       Factory       ###
+    // ###########################
     //! Base-class of ClassFactory.
-    class _CoreExport BaseFactory
+    class _CoreExport Factory
     {
         public:
-            virtual ~BaseFactory() {};
+            virtual ~Factory() {};
             virtual BaseObject* fabricate(BaseObject* creator) = 0;
     };
@@ -62 +62 @@
     //! The ClassFactory is able to create new objects of a specific class.
     template <class T>
-    class ClassFactory : public BaseFactory
+    class ClassFactory : public Factory
     {
         public:

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

@@ -80 +80 @@
 */
 #define CreateFactory(ClassName) \
-    BaseFactory* ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, true)
+    Factory* _##ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, true)
 
 /**
@@ -87 +87 @@
 */
 #define CreateUnloadableFactory(ClassName) \
-    BaseFactory* ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, false)
+    Factory* _##ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, false)
 
 /**
@@ -100 +100 @@
 {
     /**
-        @brief Returns the Identifier with a given name through the factory.
+        @brief Returns the Identifier with a given name.
         @param String The name of the class
     */
@@ -109 +109 @@
 
     /**
-        @brief Returns the Identifier with a given network ID through the factory.
+        @brief Returns the Identifier with a given lowercase name.
+        @param String The lowercase name of the class
+    */
+    inline Identifier* ClassByLowercaseString(const std::string& name)
+    {
+        return Identifier::getIdentifierByLowercaseString(name);
+    }
+
+    /**
+        @brief Returns the Identifier with a given network ID.
         @param networkID The network ID of the class
     */

code/branches/core5/src/libraries/core/CorePrereqs.h

@@ -87 +87 @@
     class ArgumentCompleter;
     class ArgumentCompletionListElement;
-    class BaseFactory;
     class BaseMetaObjectListElement;
     class BaseObject;

code/branches/core5/src/libraries/core/Identifier.cc

@@ -372 +372 @@
 
     /**
+        @brief Returns the Identifier with a given name in lowercase.
+        @param name The name of the wanted Identifier
+        @return The Identifier
+    */
+    Identifier* Identifier::getIdentifierByLowercaseString(const std::string& name)
+    {
+        std::map<std::string, Identifier*>::const_iterator it = Identifier::getLowercaseStringIdentifierMapIntern().find(name);
+        if (it != Identifier::getLowercaseStringIdentifierMapIntern().end())
+            return it->second;
+        else
+            return 0;
+    }
+
+    /**
         @brief Returns the Identifier with a given network ID.
         @param id The network ID of the wanted Identifier

code/branches/core5/src/libraries/core/Identifier.h

@@ -103 +103 @@
 
             /** @brief Sets the Factory. @param factory The factory to assign */
-            inline void addFactory(BaseFactory* factory) { this->factory_ = factory; }
+            inline void addFactory(Factory* factory) { this->factory_ = factory; }
             /** @brief Returns true if the Identifier has a Factory. */
             inline bool hasFactory() const { return (this->factory_ != 0); }
@@ -165 +165 @@
 
             static Identifier* getIdentifierByString(const std::string& name);
+            static Identifier* getIdentifierByLowercaseString(const std::string& name);
             static Identifier* getIdentifierByID(uint32_t id);
 
@@ -334 +335 @@
             bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML
             std::string name_;                                             //!< The name of the class the Identifier belongs to
-            BaseFactory* factory_;                                         //!< The Factory, able to create new objects of the given class (if available)
+            Factory* factory_;                                             //!< The Factory, able to create new objects of the given class (if available)
             static int hierarchyCreatingCounter_s;                         //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
             uint32_t networkID_;                                           //!< The network ID to identify a class through the network