Changeset 9632

Timestamp:

Aug 11, 2013, 11:00:43 AM (11 years ago)

Author:

landauf

Message:

Factory::fabricate() returns an Identifiable

Location:

code/branches/core6

Files:

• src/libraries/core/class/Identifier.cc (modified) (1 diff)
• src/libraries/core/class/Identifier.h (modified) (2 diffs)
• src/libraries/core/class/IdentifierManager.cc (modified) (1 diff)
• src/libraries/core/class/SubclassIdentifier.h (modified) (1 diff)
• src/libraries/core/object/ClassFactory.h (modified) (2 diffs)
• test/core/object/ClassFactoryTest.cc (modified) (1 diff)

code/branches/core6/src/libraries/core/class/Identifier.cc

@@ -174 +174 @@
         @return The new object
     */
-    OrxonoxClass* Identifier::fabricate(Context* context)
+    Identifiable* Identifier::fabricate(Context* context)
     {
         if (this->factory_)

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -56 +56 @@
     object->getIdentifier()->getName();                                         // returns "MyClass"
 
-    OrxonoxClass* other = object->getIdentifier()->fabricate(0);                // fabricates a new instance of MyClass
+    Identifiable* other = object->getIdentifier()->fabricate(0);                // fabricates a new instance of MyClass
 
 
@@ -125 +125 @@
             inline bool hasFactory() const { return (this->factory_ != 0); }
 
-            OrxonoxClass* fabricate(Context* context);
+            Identifiable* fabricate(Context* context);
 
             /// Returns true if the class can be loaded through XML.

code/branches/core6/src/libraries/core/class/IdentifierManager.cc

@@ -91 +91 @@
             if (it->second->hasFactory())
             {
-                OrxonoxClass* temp = it->second->fabricate(0);
-                temp->destroy();
+                Identifiable* temp = it->second->fabricate(0);
+                delete temp;
             }
         }

code/branches/core6/src/libraries/core/class/SubclassIdentifier.h

@@ -165 +165 @@
             T* fabricate(Context* context) const
             {
-                OrxonoxClass* newObject = this->identifier_->fabricate(context);
+                Identifiable* newObject = this->identifier_->fabricate(context);
 
                 // Check if the creation was successful

code/branches/core6/src/libraries/core/object/ClassFactory.h

@@ -55 +55 @@
         public:
             virtual ~Factory() {};
-            virtual OrxonoxClass* fabricate(Context* context) = 0;
+            virtual Identifiable* fabricate(Context* context) = 0;
     };
 
@@ -82 +82 @@
                 @return The new object
             */
-            inline OrxonoxClass* fabricate(Context* context)
+            inline Identifiable* fabricate(Context* context)
             {
                 return static_cast<OrxonoxClass*>(new T(context));

code/branches/core6/test/core/object/ClassFactoryTest.cc

@@ -8 +8 @@
     {
         Factory* factory = new ClassFactory<BaseObject>("BaseObject");
-        OrxonoxClass* object = factory->fabricate(NULL);
+        Identifiable* object = factory->fabricate(NULL);
         ASSERT_TRUE(object != NULL);
         BaseObject* baseObject = dynamic_cast<BaseObject*>(object);