Changeset 9599 for code/branches/core6/src/libraries/core/object/ObjectListBase.cc

Timestamp:

Mar 29, 2013, 2:33:04 PM (11 years ago)

Author:

landauf

Message:

added proper interface (ObjectListElementRemovalListener) to notify iterators about removed elements

File:

• code/branches/core6/src/libraries/core/object/ObjectListBase.cc (modified) (2 diffs)

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

@@ -70 +70 @@
 
     /**
-        @brief Increases all Iterators that currently point on the given element (because it gets removed).
-        @param object The object that gets removed
+        @brief Notifies all listeners that the given element is about to get removed.
+        @param element The element that gets removed
+        This is mainly used for iterators which point at the removed element
     */
-    void ObjectListBase::notifyIterators(Listable* object) const
+    void ObjectListBase::notifyRemovalListeners(ObjectListBaseElement* element) const
     {
-        for (std::vector<void*>::const_iterator it = this->iterators_.begin(); it != this->iterators_.end(); ++it)
-            ((Iterator<Listable>*)(*it))->incrementIfEqual(object);
-        for (std::vector<void*>::const_iterator it = this->objectListIterators_.begin(); it != this->objectListIterators_.end(); ++it)
-            ((ObjectListIterator<Listable>*)(*it))->incrementIfEqual(object);
+        for (std::vector<ObjectListElementRemovalListener*>::const_iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
+            (*it)->removedElement(element);
     }
 
@@ -109 +108 @@
     {
         orxout(verbose, context::object_list) << "Removing Object from " << element->objectBase_->getIdentifier()->getName() << "-list." << endl;
-        this->notifyIterators(element->objectBase_);
+        this->notifyRemovalListeners(element);
 
         if (element->next_)