Changeset 9661

Timestamp:

Aug 24, 2013, 6:38:55 PM (11 years ago)

Author:

landauf

Message:

Listable is now responsible for creating and deleting ObjectListElements

Location:

code/branches/core6

Files:

• src/libraries/core/object/Context.h (modified) (1 diff)
• src/libraries/core/object/Listable.cc (modified) (3 diffs)
• src/libraries/core/object/Listable.h (modified) (1 diff)
• src/libraries/core/object/ObjectListBase.h (modified) (1 diff)
• test/core/object/ObjectListBaseTest.cc (modified) (1 diff)

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

@@ -64 +64 @@
             inline void addObject(T* object)
             {
-                ObjectListBaseElement* element = this->getObjectList<T>()->add(object);
+                ObjectListBaseElement* element = Listable::createObjectListElement(object);
+                this->getObjectList<T>()->addElement(element);
                 object->elements_.push_back(element);
                 if (this->getParentContext())

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

@@ -77 +77 @@
     {
         for (size_t i = 0; i < this->elements_.size(); ++i)
-            delete this->elements_[i];
+            Listable::deleteObjectListElement(this->elements_[i]);
         this->elements_.clear();
     }
@@ -94 +94 @@
         {
             copy[i]->changeContext(this->context_, context);
-            delete copy[i];
+            Listable::deleteObjectListElement(copy[i]);
         }
 
@@ -100 +100 @@
     }
 
+    /* static */ void Listable::deleteObjectListElement(ObjectListBaseElement* element)
+    {
+        delete element;
+    }
 }

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

@@ -63 +63 @@
 
         private:
+            template <class T>
+            static ObjectListElement<T>* createObjectListElement(T* object)
+            {
+                return new ObjectListElement<T>(object);
+            }
+
+            static void deleteObjectListElement(ObjectListBaseElement* element);
+
             Context* context_;                             //!< The object will register itself in the object lists of this context
             std::vector<ObjectListBaseElement*> elements_; //!< The corresponding ObjectListElements in all object lists the object is registered in

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

@@ -128 +128 @@
             ~ObjectListBase();
 
-            template <class T>
-            inline ObjectListBaseElement* add(T* object)
-            {
-                ObjectListBaseElement* element = new ObjectListElement<T>(object);
-                this->addElement(element);
-                return element;
-            }
-
             void addElement(ObjectListBaseElement* element);
             void removeElement(ObjectListBaseElement* element);

code/branches/core6/test/core/object/ObjectListBaseTest.cc

@@ -43 +43 @@
     {
         ObjectListBase list;
-        list.add(static_cast<Listable*>(NULL));
+        list.addElement(new ObjectListElement<Listable>(NULL));
         EXPECT_EQ(1u, list.size());
     }