Changeset 9651 for code/branches/core6/src

Timestamp:

Aug 16, 2013, 9:20:59 PM (11 years ago)

Author:

landauf

Message:

register Listable in the framework

Location:

code/branches/core6/src/libraries/core

Files:

• class/Identifier.h (modified) (1 diff)
• class/IdentifierManager.cc (modified) (1 diff)
• object/Context.cc (modified) (1 diff)
• object/Listable.cc (modified) (5 diffs)

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

@@ -409 +409 @@
     void ClassIdentifier<T>::addObjectToList(T* object, Listable* listable)
     {
-        listable->getContext()->addObject(object);
+        if (listable->getContext())
+            listable->getContext()->addObject(object);
     }
 

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

@@ -127 +127 @@
                 initializedIdentifiers.insert(it->second);
             }
+
+            size_t numberOfObjects = temporaryContext.getObjectList<Listable>()->size();
+            if (numberOfObjects > 0)
+                orxout(internal_warning) << "There are still " << numberOfObjects << " listables left after creating the class hierarchy" << endl;
         }
 

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

@@ -42 +42 @@
     Context* Context::rootContext_s = 0;
 
-    Context::Context(Context* context) : Listable(this), parentContext_(context)
+    Context* getContextForInitializationOfOtherContexts()
     {
-        // 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).
+        static size_t count = 0;
+        // the first time this is called, ++count returns 1 and the context is created
+        // the second time this is called, ++count returns 2 and NULL is returned because we're in the constructor of the context itself
+        // for each future call the context (now completely created) is returned
+        if (++count == 2)
+            return NULL;
+        else
+        {
+            static Context context(NULL);
+            return &context;
+        }
+    }
+
+    // Initialize Listable(*) with a special context, only used to initialize other contexts. Later in the constructor we change the context
+    Context::Context(Context* context) : Listable(getContextForInitializationOfOtherContexts()), parentContext_(context)
+    {
+        RegisterObject(Context);
+
+        // the context is its own context
         this->setContext(this);
-
-        RegisterObject(Context);
     }
 

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

@@ -33 +33 @@
 
 #include "Listable.h"
+#include "core/CoreIncludes.h"
 #include "ObjectListBase.h"
 #include "Context.h"
@@ -38 +39 @@
 namespace orxonox
 {
+    RegisterClass(Listable);
+
     /**
         @brief Constructor: Allocates space in the element list.
@@ -45 +48 @@
         this->context_ = Context::getRootContext();
         this->elements_.reserve(6);
+
+        RegisterObject(Listable);
     }
 
     /**
-        @brief Constructor: Allocates space in the element list and assignes the context
+        @brief Constructor: Allocates space in the element list and assigns the context
     */
     Listable::Listable(Context* context)
@@ -54 +59 @@
         this->context_ = context;
         this->elements_.reserve(6);
+
+        RegisterObject(Listable);
     }
 
@@ -80 +87 @@
     void Listable::setContext(Context* context)
     {
+        assert(context);
         std::vector<ObjectListBaseElement*> copy = this->elements_;
         this->elements_.clear();