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

Timestamp:

Nov 19, 2007, 10:10:11 PM (16 years ago)

Author:

landauf

Message:

• removed the "ClassHierarchy" manager-class and put its sole feature (bIsCreatingClassHierarchy_) directly into the Identifier.

• added a dynamic_cast from OrxonoxClass to BaseObject to the Factory. OrxonoxClass is needed because several classes use Interfaces, but all classes are derived at least from BaseObject, so the cast will work.

File:

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

code/branches/objecthierarchie/src/Identifier.cc

@@ -6 +6 @@
     // ###       Identifier        ###
     // ###############################
+    int Identifier::hierarchyCreatingCounter_s = 0;
+
     Identifier::Identifier()
     {
         this->bCreatedOneObject_ = false;
-        this->directParents_ = new IdentifierList();
-        this->allParents_ = new IdentifierList();
-        this->directChildren_ = new IdentifierList();
-        this->allChildren_ = new IdentifierList();
-        this->objects_ = new ObjectList();
+//        this->directParents_ = new IdentifierList();
+//        this->allParents_ = new IdentifierList();
+//        this->directChildren_ = new IdentifierList();
+//        this->allChildren_ = new IdentifierList();
+//        this->objects_ = new ObjectList();
     }
 
     Identifier::~Identifier()
     {
-        delete this->directParents_;
-        delete this->allParents_;
-        delete this->directChildren_;
-        delete this->allChildren_;
-        delete this->objects_;
+//        delete this->directParents_;
+//        delete this->allParents_;
+//        delete this->directChildren_;
+//        delete this->allChildren_;
+//        delete this->objects_;
         delete &this->name_;
     }
@@ -40 +42 @@
             while (temp1)
             {
-                temp2 = temp1->identifier_->directParents_->first_;
+                temp2 = temp1->identifier_->directParents_.first_;
                 while (temp2)
                 {
@@ -62 +64 @@
                 if (temp1->bDirect_)
                 {
-                    this->directParents_->add(temp1->identifier_);
-                    temp1->identifier_->directChildren_->add(this);
+                    this->directParents_.add(temp1->identifier_);
+                    temp1->identifier_->directChildren_.add(this);
                 }
 
-                this->allParents_->add(temp1->identifier_);
-                temp1->identifier_->allChildren_->add(this);
+                this->allParents_.add(temp1->identifier_);
+                temp1->identifier_->allChildren_.add(this);
 
                 temp1 = temp1->next_;
@@ -77 +79 @@
     {
         std::cout << "*** Added " << this->name_ << " to list.\n";
-        this->objects_->add(object);
+        this->objects_.add(object);
     }
 
@@ -83 +85 @@
     {
         std::cout << "*** Removed " << this->name_ << " from list.\n";
-        this->objects_->remove(object);
+        this->objects_.remove(object);
     }
 
     bool Identifier::isA(Identifier* identifier)
     {
-        return (identifier == this || this->allParents_->isInList(identifier));
+        return (identifier == this || this->allParents_.isInList(identifier));
     }
 
@@ -98 +100 @@
     bool Identifier::isChildOf(Identifier* identifier)
     {
-        return this->allParents_->isInList(identifier);
+        return this->allParents_.isInList(identifier);
     }
 
     bool Identifier::isDirectChildOf(Identifier* identifier)
     {
-        return this->directParents_->isInList(identifier);
+        return this->directParents_.isInList(identifier);
     }
 
     bool Identifier::isParentOf(Identifier* identifier)
     {
-        return this->allChildren_->isInList(identifier);
+        return this->allChildren_.isInList(identifier);
     }
 
     bool Identifier::isDirectParentOf(Identifier* identifier)
     {
-        return this->directChildren_->isInList(identifier);
+        return this->directChildren_.isInList(identifier);
     }
 }