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

Timestamp:

Nov 25, 2007, 5:21:53 PM (16 years ago)

Author:

landauf

Message:

reimplementation of the factory and parts of the class-hierarchy-generating-algorithm. interfaces with protected constructors are now allowed.

File:

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

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -1 +1 @@
 #include "Identifier.h"
 #include "Factory.h"
+#include "ClassFactory.h"
 #include "IdentifierList.h"
 #include "ObjectList.h"
@@ -7 +8 @@
 
 
-#define internRegisterRootObject(ClassName, bAbstract) \
-    if (Identifier::isCreatingHierarchy() && !this->getParents()) \
-        this->setParents(new IdentifierList()); \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, true, bAbstract)); \
+#define InternRegisterObject(ClassName, bRootClass) \
+    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, bRootClass)); \
     if (Identifier::isCreatingHierarchy() && this->getParents()) \
         this->getParents()->add(this->getIdentifier()); \
     ClassIdentifier<ClassName>::addObject(this)
 
+#define InternRegisterRootObject(ClassName) \
+    if (Identifier::isCreatingHierarchy() && !this->getParents()) \
+        this->setParents(new IdentifierList()); \
+    InternRegisterObject(ClassName, true)
+
 #if HIERARCHY_VERBOSE
-#define registerRootObject(ClassName) \
-    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
-    internRegisterRootObject(ClassName, false)
+#define RegisterObject(ClassName) \
+    std::cout << "*** Register Object: " << #ClassName << "\n"; \
+    InternRegisterObject(ClassName, false)
 #else
-#define registerRootObject(ClassName) \
-    internRegisterRootObject(ClassName, false)
+#define RegisterObject(ClassName) \
+    InternRegisterObject(ClassName, false)
 #endif
 
 #if HIERARCHY_VERBOSE
-#define registerAbstractRootObject(ClassName) \
-    std::cout << "*** Register abstract Root-Object: " << #ClassName << "\n"; \
-    internRegisterRootObject(ClassName, true)
+#define RegisterRootObject(ClassName) \
+    std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
+    InternRegisterRootObject(ClassName)
 #else
-#define registerAbstractRootObject(ClassName) \
-    internRegisterRootObject(ClassName, true)
+#define RegisterRootObject(ClassName) \
+    InternRegisterRootObject(ClassName)
 #endif
 
-#define internRegisterObject(ClassName, bAbstract) \
-    this->setIdentifier(ClassIdentifier<ClassName>::registerClass(this->getParents(), #ClassName, false, bAbstract)); \
-    if (Identifier::isCreatingHierarchy() && this->getParents()) \
-        this->getParents()->add(this->getIdentifier()); \
-    ClassIdentifier<ClassName>::addObject(this)
-
-#if HIERARCHY_VERBOSE
-#define registerObject(ClassName) \
-    std::cout << "*** Register Object: " << #ClassName << "\n"; \
-    internRegisterObject(ClassName, false)
-#else
-#define registerObject(ClassName) \
-    internRegisterObject(ClassName, false)
-#endif
-
-#if HIERARCHY_VERBOSE
-#define registerAbstractObject(ClassName) \
-    std::cout << "*** Register abstract Object: " << #ClassName << "\n"; \
-    internRegisterObject(ClassName, true)
-#else
-#define registerAbstractObject(ClassName) \
-    internRegisterObject(ClassName, true)
-#endif
-
-#define unregisterObject() \
+#define UnregisterObject() \
     this->getIdentifier()->removeObject(this)
 
@@ -64 +44 @@
 
 #define CreateFactory(ClassName) \
-    Identifier* global_##ClassName##_Identifier = ClassIdentifier<ClassName>::getIdentifier()
+    bool bCreated##ClassName##Factory = ClassFactory<ClassName>::create()
 
-#define Factory(Name) \
-    ClassFactory::fabricate(Name)
+#define ID(Name) \
+    Factory::getIdentifier(Name)