Changeset 9610 for code/branches/core6

Timestamp:

Apr 1, 2013, 10:57:34 AM (12 years ago)

Author:

landauf

Message:

context is now a Listable itself as well

Location:

code/branches/core6

Files:

• src/libraries/core/object/Context.cc (modified) (1 diff)
• src/libraries/core/object/Context.h (modified) (1 diff)
• src/libraries/core/object/Listable.cc (modified) (1 diff)
• src/libraries/core/object/Listable.h (modified) (1 diff)
• test/core/CMakeLists.txt (modified) (1 diff)
• test/core/object/ContextTest.cc (added)

code/branches/core6/src/libraries/core/object/Context.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    Context::Context(Context* context) : parentContext_(context)
+    Context::Context(Context* context) : Listable(this), parentContext_(context)
     {
+        // we have to call Listable(this) to avoid circular initialization when creating a Context because Listable calls Context::getRootContext() by
+        // default AND we have to set the context again in the constructor because of other classes inheriting from Context (Listable is a virtual base
+        // and each subclass must call its constructor individually, so either all subclasses add Listable(this) to their initialization list or we call
+        // setContext(this) here).
+        this->setContext(this);
     }
 
     Context::~Context()
     {
+        // unregister context from object lists before object lists are destroyed
+        this->unregisterObject();
         for (size_t i = 0; i < this->objectLists_.size(); ++i)
             delete this->objectLists_[i];

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

@@ -39 +39 @@
 #include <vector>
 
+#include "Listable.h"
+
 namespace orxonox
 {
-    class _CoreExport Context
+    class _CoreExport Context : virtual public Listable
     {
         public:

code/branches/core6/src/libraries/core/object/Listable.cc

@@ -48 +48 @@
 
     /**
+        @brief Constructor: Allocates space in the element list and assignes the context
+    */
+    Listable::Listable(Context* context)
+    {
+        this->context_ = context;
+        this->elements_.reserve(6);
+    }
+
+    /**
         @brief Destructor: Removes the object from the object-lists
     */

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

@@ -53 +53 @@
         public:
             Listable();
+            Listable(Context* context);
             virtual ~Listable();
 

code/branches/core6/test/core/CMakeLists.txt

@@ -16 +16 @@
     command/CommandTest.cc
     object/ClassFactoryTest.cc
+    object/ContextTest.cc
     object/DestroyableTest.cc
     object/IteratorTest.cc