Changeset 9604

Timestamp:

Mar 30, 2013, 3:38:02 PM (12 years ago)

Author:

landauf

Message:

added some checks and a size() function to object list

Location:

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

Files:

• ObjectList.h (modified) (1 diff)
• ObjectListBase.cc (modified) (7 diffs)
• ObjectListBase.h (modified) (5 diffs)
• ObjectListIterator.h (modified) (1 diff)

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

@@ -68 +68 @@
             typedef ObjectListIterator<T> iterator;
 
+            /// Returns the size of the list
+            inline static size_t size()
+            {
+                return ClassIdentifier<T>::getIdentifier()->getObjects()->size();
+            }
+
             /// Returns an Iterator to the first element in the list.
             inline static ObjectListElement<T>* begin()

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

@@ -43 +43 @@
     ObjectListBaseElement::~ObjectListBaseElement()
     {
-        this->list_->removeElement(this);
+        if (this->list_)
+            this->list_->removeElement(this);
     }
 
@@ -53 +54 @@
         this->first_ = 0;
         this->last_ = 0;
+        this->size_ = 0;
     }
 
@@ -60 +62 @@
     ObjectListBase::~ObjectListBase()
     {
-        ObjectListBaseElement* temp;
         while (this->first_)
-        {
-            temp = this->first_->next_;
             delete this->first_;
-            this->first_ = temp;
-        }
     }
 
@@ -86 +83 @@
     void ObjectListBase::addElement(ObjectListBaseElement* element)
     {
+        if (element->list_)
+        {
+            orxout(internal_error) << "Element is already registered in another list" << endl;
+            return;
+        }
+
         if (!this->last_)
         {
             // If the list is empty
             this->last_ = element;
-            this->first_ = this->last_; // There's only one object in the list now
+            this->first_ = element; // There's only one object in the list now
         }
         else
@@ -97 +100 @@
             ObjectListBaseElement* temp = this->last_;
             this->last_ = element;
-            this->last_->prev_ = temp;
-            temp->next_ = this->last_;
+            element->prev_ = temp;
+            temp->next_ = element;
         }
+
+        element->list_ = this;
+        ++this->size_;
     }
 
@@ -107 +113 @@
     void ObjectListBase::removeElement(ObjectListBaseElement* element)
     {
-        orxout(verbose, context::object_list) << "Removing Object from " << element->objectBase_->getIdentifier()->getName() << "-list." << endl;
+        if (element->list_ != this)
+        {
+            orxout(internal_error) << "Element is not registered in this list" << endl;
+            return;
+        }
+
+        if (element->objectBase_)
+            orxout(verbose, context::object_list) << "Removing Object from " << element->objectBase_->getIdentifier()->getName() << "-list." << endl;
         this->notifyRemovalListeners(element);
 
@@ -119 +132 @@
         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
+
+        element->list_ = 0;
+        element->next_ = 0;
+        element->prev_ = 0;
+        --this->size_;
     }
 }

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

@@ -56 +56 @@
                 @param objectBase The object to store
             */
-            ObjectListBaseElement(Listable* object, ObjectListBase* list) : next_(0), prev_(0), objectBase_(object), list_(list) {}
+            ObjectListBaseElement(Listable* object) : next_(0), prev_(0), objectBase_(object), list_(0) {}
             ~ObjectListBaseElement();
 
@@ -74 +74 @@
     {
         public:
-            ObjectListElement(T* object, ObjectListBase* list) : ObjectListBaseElement(static_cast<Listable*>(object), list), object_(object) {}
+            ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
             T* object_;              //!< The object
     };
@@ -113 +113 @@
             inline ObjectListBaseElement* add(T* object)
             {
-                ObjectListBaseElement* element = new ObjectListElement<T>(object, this);
+                ObjectListBaseElement* element = new ObjectListElement<T>(object);
                 this->addElement(element);
                 return element;
@@ -120 +120 @@
             void addElement(ObjectListBaseElement* element);
             void removeElement(ObjectListBaseElement* element);
+
+            size_t size() const { return this->size_; }
 
             /// Returns a pointer to the first element in the list. Works only with Iterator.
@@ -148 +150 @@
             ObjectListBaseElement* first_;                              //!< The first element in the list
             ObjectListBaseElement* last_;                               //!< The last element in the list
+            size_t size_;                                               //!< The number of elements in the list
             std::vector<ObjectListElementRemovalListener*> listeners_;  //!< A list of Iterators pointing on an element in this list
     };

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

@@ -70 +70 @@
     class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T> >
     {
-        template <class I>
-        friend class Iterator;
-
         public:
             /**