Changeset 150 for code/branches

Timestamp:

Nov 2, 2007, 2:28:23 AM (17 years ago)

Author:

landauf

Message:

no idea if this has any chance to work… template-syntax is crap

Location:

code/branches/objecthierarchie/src

Files:

• BaseObject.h (modified) (1 diff)
• ClassHierarchy.cc (modified) (3 diffs)
• ClassHierarchy.h (modified) (7 diffs)

code/branches/objecthierarchie/src/BaseObject.h

@@ -25 +25 @@
                 { this->identifier_->isDirectParentOf(identifier); }
 
-            Identifier* identifier_;
+            ClassIdentifier<class BaseObject>* identifier_;
 
         protected:

code/branches/objecthierarchie/src/ClassHierarchy.cc

@@ -6 +6 @@
     // ###       Identifier        ###
     // ###############################
-    Identifier* Identifier::pointer_ = NULL;
+//    Identifier* Identifier::pointer_ = NULL;
 /*
     Identifier* Identifier::registerClass(IdentifierList* parents)
@@ -65 +65 @@
                 {
                     this->directParents_->add(temp1->identifier_);
-                    temp1->identifier_->directChildren_->add(this->pointer_);
+                    temp1->identifier_->directChildren_->add(this);
                 }
 
                 this->allParents_->add(temp1->identifier_);
-                temp1->identifier_->allChildren_->add(this->pointer_);
+                temp1->identifier_->allChildren_->add(this);
 
                 temp1 = temp1->next_;
@@ -88 +88 @@
     bool Identifier::isA(Identifier* identifier)
     {
-        return (identifier == this->pointer_ || this->allParents_->isInList(identifier));
+        return (identifier == this || this->allParents_->isInList(identifier));
     }
 
     bool Identifier::isDirectA(Identifier* identifier)
     {
-        return (identifier == this->pointer_);
+        return (identifier == this);
     }
 

code/branches/objecthierarchie/src/ClassHierarchy.h

@@ -22 +22 @@
     class ObjectList;
     class BaseObject;
+    template <class T>
+    class ClassIdentifier;
 
     class Identifier
@@ -29 +31 @@
 
         public:
-//            static Identifier* registerClass(IdentifierList* parents);
             void addObject(BaseObject* object);
             void removeObject(BaseObject* object);
@@ -40 +41 @@
             bool isDirectParentOf(Identifier* identifier);
 
-        protected:
+        private:
             Identifier();
-            void initialize(IdentifierList* identifier);
-
-            static Identifier* pointer_;
+            void initialize(IdentifierList* parents);
 
             IdentifierList* directParents_;
@@ -54 +53 @@
             std::string name_;
 
-        private:
             bool bCreatedOneObject_;
     };
@@ -61 +59 @@
     class ClassIdentifier : public Identifier
     {
-//        friend class Identifier;
-
         public:
-            static Identifier* registerClass(IdentifierList* parents);
-            static Identifier* getIdentifier();
+            static ClassIdentifier<T>* registerClass(IdentifierList* parents);
+            static ClassIdentifier<T>* getIdentifier();
             static T* create();
 
         private:
             ClassIdentifier();
+
+            static ClassIdentifier<T>* pointer_;
+
     };
 
     #define getStringFromClassName(ClassName) \
         #ClassName
+
+    template <class T>
+    ClassIdentifier<T>* ClassIdentifier<T>::pointer_ = NULL;
 
     template <class T>
@@ -81 +83 @@
 
     template <class T>
-    Identifier* ClassIdentifier<T>::registerClass(IdentifierList* parents)
+    ClassIdentifier<T>* ClassIdentifier<T>::registerClass(IdentifierList* parents)
     {
         if (!pointer_)
@@ -94 +96 @@
 
     template <class T>
-    Identifier* ClassIdentifier<T>::getIdentifier()
+    ClassIdentifier<T>* ClassIdentifier<T>::getIdentifier()
     {
         if (!pointer_)