Changeset 243 for code/branches/objecthierarchie/src/Identifier.cc

Timestamp:

Nov 25, 2007, 4:07:56 AM (16 years ago)

Author:

landauf

Message:

removed the "directParent" feature - it was a clever but unnecessary feature.

File:

• code/branches/objecthierarchie/src/Identifier.cc (modified) (5 diffs)

code/branches/objecthierarchie/src/Identifier.cc

@@ -12 +12 @@
         this->bCreatedOneObject_ = false;
 
-        this->directChildren_ = new IdentifierList;
-        this->allChildren_ = new IdentifierList;
+        this->children_ = new IdentifierList;
     }
 
@@ -20 +19 @@
         delete &this->name_;
 
-        delete this->directChildren_;
-        delete this->allChildren_;
+        delete this->children_;
     }
 
@@ -33 +31 @@
             this->bCreatedOneObject_ = true;
 
-            IdentifierListElement* temp1;
-            IdentifierListElement* temp2;
-            IdentifierListElement* temp3;
-
-            temp1 = parents->first_;
+            IdentifierListElement* temp1 = parents->first_;
             while (temp1)
             {
-                temp2 = temp1->identifier_->directParents_.first_;
-                while (temp2)
-                {
-                    temp3 = parents->first_;
-                    while(temp3)
-                    {
-                        if (temp3->identifier_ == temp2->identifier_)
-                            temp3->bDirect_ = false;
-
-                        temp3 = temp3->next_;
-                    }
-
-                    temp2 = temp2->next_;
-                }
-                temp1 = temp1->next_;
-            }
-
-            temp1 = parents->first_;
-            while (temp1)
-            {
-                if (temp1->bDirect_)
-                {
-                    this->directParents_.add(temp1->identifier_);
-                    temp1->identifier_->getDirectChildren().add(this);
-                }
-
-                this->allParents_.add(temp1->identifier_);
-                temp1->identifier_->getAllChildren().add(this);
+                this->parents_.add(temp1->identifier_);
+                temp1->identifier_->getChildren().add(this);
 
                 temp1 = temp1->next_;
@@ -76 +44 @@
     bool Identifier::isA(const Identifier* identifier) const
     {
-        return (identifier == this || this->allParents_.isInList(identifier));
+        return (identifier == this || this->parents_.isInList(identifier));
     }
 
@@ -86 +54 @@
     bool Identifier::isChildOf(const Identifier* identifier) const
     {
-        return this->allParents_.isInList(identifier);
-    }
-
-    bool Identifier::isDirectChildOf(const Identifier* identifier) const
-    {
-        return this->directParents_.isInList(identifier);
+        return this->parents_.isInList(identifier);
     }
 
     bool Identifier::isParentOf(const Identifier* identifier) const
     {
-        return this->allChildren_->isInList(identifier);
-    }
-
-    bool Identifier::isDirectParentOf(const Identifier* identifier) const
-    {
-        return this->directChildren_->isInList(identifier);
+        return this->children_->isInList(identifier);
     }
 }