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

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.h (modified) (7 diffs)

code/branches/objecthierarchie/src/Identifier.h

@@ -28 +28 @@
         public:
             virtual void removeObject(OrxonoxClass* object) const = 0;
+            virtual void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const = 0;
 
             virtual BaseObject* fabricate() const = 0;
@@ -34 +35 @@
             bool isDirectlyA(const Identifier* identifier) const;
             bool isChildOf(const Identifier* identifier) const;
-            bool isDirectChildOf(const Identifier* identifier) const;
             bool isParentOf(const Identifier* identifier) const;
-            bool isDirectParentOf(const Identifier* identifier) const;
 
             const std::string& getName() const { return this->name_; }
-            const IdentifierList& getDirectParents() const { return this->directParents_; }
-            const IdentifierList& getAllParents() const { return this->allParents_; }
-            IdentifierList& getDirectChildren() const { return *this->directChildren_; }
-            IdentifierList& getAllChildren() const { return *this->allChildren_; }
+            const IdentifierList& getParents() const { return this->parents_; }
+            IdentifierList& getChildren() const { return *this->children_; }
 
             static bool isCreatingHierarchy() { return (hierarchyCreatingCounter_s > 0); }
@@ -68 +65 @@
             }
 
-            IdentifierList directParents_;
-            IdentifierList allParents_;
-            IdentifierList* directChildren_;
-            IdentifierList* allChildren_;
+            IdentifierList parents_;
+            IdentifierList* children_;
 
             std::string name_;
@@ -98 +93 @@
             static void addObject(T* object);
             void removeObject(OrxonoxClass* object) const;
+            void removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const;
 
         private:
@@ -212 +208 @@
         bool bIterateForwards = !Identifier::isCreatingHierarchy();
 
+        this->removeObjectIntern(object, bIterateForwards);
+
+        IdentifierListElement* temp = this->parents_.first_;
+        while (temp)
+        {
+            temp->identifier_->removeObjectIntern(object, bIterateForwards);
+            temp = temp->next_;
+        }
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::removeObjectIntern(OrxonoxClass* object, bool bIterateForwards) const
+    {
 #if HIERARCHY_VERBOSE
         if (bIterateForwards)
@@ -220 +229 @@
 
         this->objects_->remove(object, bIterateForwards);
-
-        IdentifierListElement* temp = this->directParents_.first_;
-        while (temp)
-        {
-            temp->identifier_->removeObject(object);
-            temp = temp->next_;
-        }
     }
 
@@ -295 +297 @@
             inline bool isChildOf(const Identifier* identifier) const
                 { return this->identifier_->isChildOf(identifier); }
-            inline bool isDirectChildOf(const Identifier* identifier) const
-                { return this->identifier_->isDirectChildOf(identifier); }
             inline bool isParentOf(const Identifier* identifier) const
                 { return this->identifier_->isParentOf(identifier); }
-            inline bool isDirectParentOf(const Identifier* identifier) const
-                { return this->identifier_->isDirectParentOf(identifier); }
 
         private: