Changeset 5777

Timestamp:

Sep 24, 2009, 12:15:20 AM (15 years ago)

Author:

landauf

Message:

simplified ClassFactory creation
fixed typo in Factory

Location:

code/branches/core5/src/libraries/core

Files:

• ClassFactory.h (modified) (4 diffs)
• CoreIncludes.h (modified) (2 diffs)
• Factory.h (modified) (1 diff)
• Identifier.cc (modified) (1 diff)
• SubclassIdentifier.h (modified) (1 diff)

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

@@ -54 +54 @@
     {
         public:
+            virtual ~BaseFactory() {};
             virtual BaseObject* fabricate(BaseObject* creator) = 0;
-            virtual ~BaseFactory() {};
     };
 
@@ -66 +66 @@
     {
         public:
-            static bool create(const std::string& name, bool bLoadable = true);
+            ClassFactory(const std::string& name, bool bLoadable = true);
             BaseObject* fabricate(BaseObject* creator);
-
-        private:
-            ClassFactory() {}                               // Don't create
-            ClassFactory(const ClassFactory& factory) {}    // Don't copy
-            virtual ~ClassFactory() {}                      // Don't delete
-
-            static T* createNewObject(BaseObject* creator);
     };
 
@@ -84 +77 @@
     */
     template <class T>
-    bool ClassFactory<T>::create(const std::string& name, bool bLoadable)
+    ClassFactory<T>::ClassFactory(const std::string& name, bool bLoadable)
     {
         COUT(4) << "*** ClassFactory: Create entry for " << name << " in Factory." << std::endl;
-        ClassIdentifier<T>::getIdentifier(name)->addFactory(new ClassFactory<T>);
+        ClassIdentifier<T>::getIdentifier(name)->addFactory(this);
         ClassIdentifier<T>::getIdentifier()->setLoadable(bLoadable);
         Factory::add(name, ClassIdentifier<T>::getIdentifier());
-
-        return true;
     }
 
@@ -101 +92 @@
     inline BaseObject* ClassFactory<T>::fabricate(BaseObject* creator)
     {
-        return ClassFactory<T>::createNewObject(creator);
-    }
-
-    /**
-        @brief Creates and returns a new object of class T; this is a wrapper for the new operator.
-        @return The new object
-    */
-    template <class T>
-    inline T* ClassFactory<T>::createNewObject(BaseObject* creator)
-    {
-        return new T(creator);
+        return static_cast<BaseObject*>(new T(creator));
     }
 }

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

@@ -81 +81 @@
 */
 #define CreateFactory(ClassName) \
-    bool bCreated##ClassName##Factory = orxonox::ClassFactory<ClassName>::create(#ClassName, true)
+    BaseFactory* ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, true)
 
 /**
@@ -88 +88 @@
 */
 #define CreateUnloadableFactory(ClassName) \
-    bool bCreated##ClassName##Factory = orxonox::ClassFactory<ClassName>::create(#ClassName, false)
+    BaseFactory* ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, false)
 
 /**

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

@@ -69 +69 @@
 
             /** @brief Returns the factory-map. */
-            static const std::map<std::string, Identifier*>& getFacbtoryMap()
+            static const std::map<std::string, Identifier*>& getFactoryMap()
                 { return Factory::getFactoryPointer()->identifierStringMap_; }
             /** @brief Returns the begin-iterator of the factory-map. */

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

@@ -235 +235 @@
             COUT(1) << "Aborting..." << std::endl;
             abort();
-            return NULL;
+            return 0;
         }
     }

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

@@ -174 +174 @@
                     }
 
-                    assert(false);
+                    COUT(1) << "Aborting..." << std::endl;
+                    abort();
                     return 0;
                 }