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

Timestamp:

Mar 27, 2013, 11:17:45 PM (11 years ago)

Author:

landauf

Message:

moved logic to remove an element from an ObjectListBase from MetaObjectList to ObjectListBase

File:

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

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

@@ -36 +36 @@
 #include <set>
 #include "Iterator.h"
+#include "Listable.h"
 #include "ObjectListIterator.h"
 
@@ -43 +44 @@
         @brief Constructor: Sets default values.
     */
-    ObjectListBase::ObjectListBase(Identifier* identifier)
+    ObjectListBase::ObjectListBase()
     {
-        this->identifier_ = identifier;
         this->first_ = 0;
         this->last_ = 0;
@@ -81 +81 @@
         @return The pointer to the new ObjectListBaseElement, needed by the MetaObjectList of the added object
     */
-    ObjectListBaseElement* ObjectListBase::add(ObjectListBaseElement* element)
+    ObjectListBaseElement* ObjectListBase::addElement(ObjectListBaseElement* element)
     {
         if (!this->last_)
@@ -100 +100 @@
         return this->last_;
     }
+
+    void ObjectListBase::removeElement(ObjectListBaseElement* element)
+    {
+        orxout(verbose, context::object_list) << "Removing Object from " << element->objectBase_->getIdentifier()->getName() << "-list." << endl;
+        this->notifyIterators(element->objectBase_);
+
+        if (element->next_)
+            element->next_->prev_ = element->prev_;
+        else
+            this->last_ = element->prev_; // If there is no next_, we deleted the last object and have to update the last_ pointer of the list
+
+        if (element->prev_)
+            element->prev_->next_ = element->next_;
+        else
+            this->first_ = element->next_; // If there is no prev_, we deleted the first object and have to update the first_ pointer of the list
+    }
 }