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

Timestamp:

Nov 20, 2007, 8:38:53 PM (16 years ago)

Author:

landauf

Message:

• *cough* fixed another small bug in the object-list *cough*

• made the object-list a template, to avoid a dynamic_cast in the Iterator

File:

• code/branches/objecthierarchie/src/Identifier.h (modified) (7 diffs)

code/branches/objecthierarchie/src/Identifier.h

@@ -26 +26 @@
     class BaseObject;
 
-    // ##### Identifier #####
+    // ###############################
+    // ###       Identifier        ###
+    // ###############################
     class Identifier
     {
@@ -35 +37 @@
         friend class BaseIdentifier;
 
-        template <class T>
-        friend class Iterator;
-
         public:
-            void addObject(OrxonoxClass* object);
-            void removeObject(OrxonoxClass* object);
+            virtual void removeObject(OrxonoxClass* object) {};
 
             virtual BaseObject* fabricate() {};
@@ -73 +71 @@
             IdentifierList allChildren_;
 
-            ObjectList objects_;
             std::string name_;
 
@@ -83 +80 @@
 
 
-    // ##### ClassIdentifier #####
+    // ###############################
+    // ###     ClassIdentifier     ###
+    // ###############################
     template <class T>
     class ClassIdentifier : public Identifier
     {
+        template <class U>
+        friend class Iterator;
+
         public:
             static ClassIdentifier<T>* registerClass(IdentifierList* parents, std::string name, bool bRootClass, bool bIsAbstractClass);
@@ -92 +94 @@
             BaseObject* fabricate();
             T* fabricateClass();
+            static void addObject(T* object);
+            void removeObject(OrxonoxClass* object);
 
         private:
@@ -99 +103 @@
 
             static ClassIdentifier<T>* pointer_s;
-
+            ObjectList<T> objects_s;
     };
 
@@ -182 +186 @@
     }
 
-    // ##### BaseIdentifier #####
+    template <class T>
+    void ClassIdentifier<T>::addObject(T* object)
+    {
+        std::cout << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
+        ClassIdentifier<T>::getIdentifier()->objects_s.add(object);
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::removeObject(OrxonoxClass* object)
+    {
+        bool bIterateForwards = !Identifier::isCreatingHierarchy();
+
+        if (bIterateForwards)
+            std::cout << "*** Removed object from " << this->name_ << "-list, iterating forwards.\n";
+        else
+            std::cout << "*** Removed object from " << this->name_ << "-list, iterating backwards.\n";
+
+        this->objects_s.remove(object, bIterateForwards);
+
+        IdentifierListElement* temp = this->directParents_.first_;
+        while (temp)
+        {
+            temp->identifier_->removeObject(object);
+            temp = temp->next_;
+        }
+    }
+
+
+    // ###############################
+    // ###     BaseIdentifier      ###
+    // ###############################
     template <class B>
     class BaseIdentifier