Changeset 9599

Timestamp:

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

Author:

landauf

Message:

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

Location:

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

Files:

• IteratorBase.h (modified) (4 diffs)
• ObjectListBase.cc (modified) (2 diffs)
• ObjectListBase.h (modified) (2 diffs)

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

@@ -47 +47 @@
     */
     template <class T, class I>
-    class IteratorBase
+    class IteratorBase : public ObjectListElementRemovalListener
     {
         public:
@@ -169 +169 @@
 
             /**
-                @brief Increments the Iterator if it points at the given object.
+                @brief Increments the Iterator if it points at the given element.
                 @param object The object to compare with
             */
-            inline void incrementIfEqual(Listable* object)
-            {
-                if (this->element_ && this->element_->objectBase_ == object)
+            virtual void removedElement(ObjectListBaseElement* element)
+            {
+                if (this->element_ == element)
                     this->operator++();
             }
@@ -194 +194 @@
                 {
                     this->list_ = this->element_->list_;
-                    this->list_->registerIterator(this);
+                    this->list_->registerRemovalListener(this);
                 }
                 else
@@ -206 +206 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
+                    this->list_->unregisterRemovalListener(this);
             }
 

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_)

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

@@ -79 +79 @@
 
 
+    // ########################################
+    // ### ObjectListElementRemovalListener ###
+    // ########################################
+    /// Gets called by the object list if an element is removed
+    class _CoreExport ObjectListElementRemovalListener
+    {
+        public:
+            virtual ~ObjectListElementRemovalListener() {}
+            virtual void removedElement(ObjectListBaseElement* element) = 0;
+    };
+
     // ###############################
     // ###     ObjectListBase      ###
@@ -119 +130 @@
             inline ObjectListBaseElement* rend() { return 0; }
 
-            inline void registerIterator(void* iterator) { this->iterators_.push_back(iterator); }
-            inline void unregisterIterator(void* iterator)
+            inline void registerRemovalListener(ObjectListElementRemovalListener* listener) { this->listeners_.push_back(listener); }
+            inline void unregisterRemovalListener(ObjectListElementRemovalListener* listener)
             {
-                for (unsigned int i = 0; i < this->iterators_.size(); ++i)
+                for (unsigned int i = 0; i < this->listeners_.size(); ++i)
                 {
-                    if (iterators_[i] == iterator)
+                    if (listeners_[i] == listener)
                     {
-                        iterators_.erase(iterators_.begin() + i);
+                        listeners_.erase(listeners_.begin() + i);
                         break;
                     }
                 }
             }
-            inline void registerObjectListIterator(void* iterator) { this->objectListIterators_.push_back(iterator); }
-            inline void unregisterObjectListIterator(void* iterator)
-            {
-                for (unsigned int i = 0; i < this->objectListIterators_.size(); ++i)
-                {
-                    if (objectListIterators_[i] == iterator)
-                    {
-                        objectListIterators_.erase(objectListIterators_.begin() + i);
-                        break;
-                    }
-                }
-            }
-            void notifyIterators(Listable* object) const;
 
         private:
-            ObjectListBaseElement* first_;           //!< The first element in the list
-            ObjectListBaseElement* last_;            //!< The last element in the list
-            std::vector<void*> iterators_;           //!< A list of Iterators pointing on an element in this list
-            std::vector<void*> objectListIterators_; //!< A list of ObjectListIterators pointing on an element in this list
+            void notifyRemovalListeners(ObjectListBaseElement* element) const;
+
+            ObjectListBaseElement* first_;                              //!< The first element in the list
+            ObjectListBaseElement* last_;                               //!< The last element in the list
+            std::vector<ObjectListElementRemovalListener*> listeners_;  //!< A list of Iterators pointing on an element in this list
     };
 }