Changeset 220 for code/branches/objecthierarchie/src/IdentifierIncludes.h

Timestamp:

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

Author:

landauf

Message:

• fixed a small bug in the object hierarchy

• new objects are now added to all class-lists they're derived from (until now they were only added to the list of their class). this means: i'm replacing the tree-structure by a mountain-one, which costs more memory but allows faster iteration.

File:

• code/branches/objecthierarchie/src/IdentifierIncludes.h (modified) (2 diffs)

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -6 +6 @@
 
 
-#define registerRootObject(ClassName) \
-    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
+#define internRegisterRootObject(ClassName, bAbstract) \
     if (Identifier::isCreatingHierarchy() && !this->getParents()) \
         this->setParents(new IdentifierList()); \
-    if (this->getIdentifier()) \
-        this->getIdentifier()->removeObject(this); \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, false)); \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, bAbstract)); \
     if (Identifier::isCreatingHierarchy() && this->getParents()) \
         this->getParents()->add(this->getIdentifier()); \
     this->getIdentifier()->addObject(this)
 
+#define registerRootObject(ClassName) \
+    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
+    internRegisterRootObject(ClassName, false)
+
 #define registerAbstractRootObject(ClassName) \
-    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
-    if (Identifier::isCreatingHierarchy() && !this->getParents()) \
-        this->setParents(new IdentifierList()); \
-    if (this->getIdentifier()) \
-        this->getIdentifier()->removeObject(this); \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, true)); \
+    std::cout << "*** Register abstract Root-Object: " << #ClassName << "\n"; \
+    internRegisterRootObject(ClassName, true)
+
+#define internRegisterObject(ClassName, bAbstract) \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, bAbstract)); \
     if (Identifier::isCreatingHierarchy() && this->getParents()) \
         this->getParents()->add(this->getIdentifier()); \
@@ -30 +30 @@
 #define registerObject(ClassName) \
     std::cout << "*** Register Object: " << #ClassName << "\n"; \
-    this->getIdentifier()->removeObject(this); \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, false)); \
-    if (Identifier::isCreatingHierarchy() && this->getParents()) \
-        this->getParents()->add(this->getIdentifier()); \
-    this->getIdentifier()->addObject(this)
+    internRegisterObject(ClassName, false)
 
 #define registerAbstractObject(ClassName) \
-    std::cout << "*** Register Object: " << #ClassName << "\n"; \
-    this->getIdentifier()->removeObject(this); \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, true)); \
-    if (Identifier::isCreatingHierarchy() && this->getParents()) \
-        this->getParents()->add(this->getIdentifier()); \
-    this->getIdentifier()->addObject(this)
+    std::cout << "*** Register abstract Object: " << #ClassName << "\n"; \
+    internRegisterObject(ClassName, true)
 
 #define unregisterObject() \