Changeset 9556

Timestamp:

Mar 23, 2013, 4:34:14 PM (12 years ago)

Author:

landauf

Message:

fabricate() should return OrxonoxClass*

Location:

code/branches/core6/src/libraries

Files:

• core/ClassFactory.h (modified) (2 diffs)
• core/Identifier.cc (modified) (2 diffs)
• core/Identifier.h (modified) (3 diffs)
• core/SubclassIdentifier.h (modified) (2 diffs)
• core/XMLPort.cc (modified) (1 diff)
• network/synchronisable/Synchronisable.cc (modified) (1 diff)

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

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

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

@@ -198 +198 @@
             if (it->second->hasFactory())
             {
-                BaseObject* temp = it->second->fabricate(0);
+                OrxonoxClass* temp = it->second->fabricate(0);
                 temp->destroy();
             }
@@ -234 +234 @@
         @return The new object
     */
-    BaseObject* Identifier::fabricate(BaseObject* creator)
+    OrxonoxClass* Identifier::fabricate(BaseObject* creator)
     {
         if (this->factory_)
         {
-            return this->factory_->fabricate(creator); // We have to return a BaseObject, because we don't know the exact type.
+            return this->factory_->fabricate(creator);
         }
         else

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

@@ -56 +56 @@
     object->getIdentifier()->getName();                                         // returns "MyClass"
 
-    BaseObject* other = object->getIdentifier()->fabricate(0);                  // fabricates a new instance of MyClass
+    OrxonoxClass* other = object->getIdentifier()->fabricate(0);                // fabricates a new instance of MyClass
 
 
@@ -62 +62 @@
     ObjectListBase* objects = object->getIdentifier()->getObjects();            // get a pointer to the object-list
     int count;
-    for (Iterator<BaseObject> it = objects.begin(); it != objects.end(); ++it)  // iterate through the objects
+    for (Iterator<MyClass> it = objects.begin(); it != objects.end(); ++it)     // iterate through the objects
         ++count;
     orxout() << count << endl;                                                  // prints "2" because we created 2 instances of MyClass so far
@@ -133 +133 @@
             inline bool hasFactory() const { return (this->factory_ != 0); }
 
-            BaseObject* fabricate(BaseObject* creator);
+            OrxonoxClass* fabricate(BaseObject* creator);
 
             /// Returns true if the class can be loaded through XML.

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

@@ -53 +53 @@
     There are two possibilities to create an object out of a SubclassIdentifier: Either you just use
     the @c fabricate() function of the assigned Identifier through the overloaded @c operator->, which
-    returns a @c BaseObject* pointer, or you use the function of SubclassIdentifier, this time by using
+    returns a @c OrxonoxClass* pointer, or you use the function of SubclassIdentifier, this time by using
     @c operator., which returns a @c BaseClass* pointer (@a BaseClass is the baseclass specified by the
     template argument):
     @code
-    identifier->fabricate();    // calls Identifier::fabricate(), creates a SubClass, returns a BaseObject* pointer
+    identifier->fabricate();    // calls Identifier::fabricate(), creates a SubClass, returns a OrxonoxClass* pointer
 
     identifier.fabricate();     // calls SubclassIdentifier::fabricate(), creates a SubClass, returns a BaseClass* pointer
@@ -165 +165 @@
             T* fabricate(BaseObject* creator) const
             {
-                BaseObject* newObject = this->identifier_->fabricate(creator);
+                OrxonoxClass* newObject = this->identifier_->fabricate(creator);
 
                 // Check if the creation was successful

code/branches/core6/src/libraries/core/XMLPort.cc

@@ -89 +89 @@
                         orxout(verbose, context::xml) << object->getLoaderIndentation() << "fabricating " << child->Value() << "..." << endl;
 
-                        BaseObject* newObject = identifier->fabricate(object);
+                        BaseObject* newObject = orxonox_cast<BaseObject*>(identifier->fabricate(object));
                         newObject->setLoaderIndentation(object->getLoaderIndentation() + "  ");
 

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc

@@ -156 +156 @@
     }
     assert(getSynchronisable(header.getObjectID())==0);   //make sure no object with this id exists
-    BaseObject *bo = id->fabricate(creator);
+    BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(creator));
     assert(bo);
     Synchronisable *no = orxonox_cast<Synchronisable*>(bo);