Changeset 9627 for code/branches/core6/src/libraries/core

Timestamp:

Aug 9, 2013, 12:27:05 AM (11 years ago)

Author:

landauf

Message:

fixed bug: Listable::setContext didn't work properly with sub-contexts (contexts whose root-context is != NULL)

Location:

code/branches/core6/src/libraries/core/object

Files:

• Listable.cc (modified) (1 diff)
• ObjectListBase.h (modified) (2 diffs)

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

@@ -80 +80 @@
     void Listable::setContext(Context* context)
     {
+        std::vector<ObjectListBaseElement*> copy = this->elements_;
+        this->elements_.clear();
+
+        for (size_t i = 0; i < copy.size(); ++i)
+        {
+            copy[i]->changeContext(this->context_, context);
+            delete copy[i];
+        }
+
         this->context_ = context;
-        for (size_t i = 0; i < this->elements_.size(); ++i)
-            this->elements_[i]->changeContext(context);
     }
 

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

@@ -60 +60 @@
             virtual ~ObjectListBaseElement() { this->removeFromList(); }
 
-            virtual void changeContext(Context* context) = 0;
+            virtual void changeContext(Context* oldContext, Context* newContext) = 0;
 
             ObjectListBaseElement* next_;       //!< The next element in the list
@@ -82 +82 @@
             ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
 
-            virtual void changeContext(Context* context)
+            virtual void changeContext(Context* oldContext, Context* newContext)
             {
+                // add object to new context, but only if this element belongs exactly to the old context (and not to a sub-context to avoid re-adding objects
+                // multiple times if they are in multiple contexts)
+                if (oldContext->getObjectList<T>() == this->list_)
+                    newContext->addObject(this->object_);
+
+                // remove from old list
                 this->removeFromList();
-                context->getObjectList<T>()->addElement(this);
             }