Changeset 5296 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 7, 2005, 10:42:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: modiefied PNode to match Element2D's removal methods.
see destructor header for more detail

File:

• trunk/src/lib/coord/p_node.cc (modified) (2 diffs)

trunk/src/lib/coord/p_node.cc

@@ -74 +74 @@
 
 /**
- *  standard deconstructor
-*/
+ * standard deconstructor
+ *
+ * There are two general ways to delete a PNode
+ * 1. delete instance;
+ *   -> result
+ *    delete this Node and all its children and children's children...
+ *    (danger if you still need the children's instance somewhere else!!)
+ *
+ * 2. instance->remove2D(); delete instance;
+ *   -> result:
+ *    moves its children to the NullParent
+ *    then deletes the Element.
+ */
 PNode::~PNode ()
 {
-  if (this->parent)
-    this->parent->removeChild(this);
-  else
-  {
-   tIterator<PNode>* iterator = this->children->getIterator();
-   PNode* pn = iterator->firstElement();
-   while( pn != NULL)
-     {
-       delete pn;
-       pn = iterator->nextElement();
-     }
-   delete iterator;
-   /* this deletes all children in the list */
+  // remove the Node, delete it's children.
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* child = iterator->firstElement();
+
+  while( child != NULL)
+  {
+    delete child;
+    child = iterator->nextElement();
+  }
+  delete iterator;
+
+  if (this->parent != NULL)
+  {
+    this->parent->children->remove(this);
+    this->parent = NULL;
   }
   delete this->children;
+
+  // remove all other allocated memory.
   if (this->toCoordinate != NULL)
     delete this->toCoordinate;
@@ -98 +113 @@
     delete this->toDirection;
 }
+
 
 /**