Changeset 811 for code/branches/core/src/orxonox/core/Identifier.h

Timestamp:

Feb 13, 2008, 6:39:53 PM (16 years ago)

Author:

landauf

Message:

• Changed the ClassManager/IdentifierDistributor: ClassIdentifiers are now saved with the name returned by typeid(class).name() because this is a simple way getting the name without creating an object (which might be impossible because of non-public constructors or abstract functions).

• Changed some debug outputs

File:

• code/branches/core/src/orxonox/core/Identifier.h (modified) (11 diffs)

code/branches/core/src/orxonox/core/Identifier.h

@@ -147 +147 @@
             {
                 hierarchyCreatingCounter_s++;
-                COUT(4) << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
+                COUT(4) << "*** Identifier: Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -156 +156 @@
             {
                 hierarchyCreatingCounter_s--;
-                COUT(4) << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
+                COUT(4) << "*** Identifier: Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -228 +228 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass)
     {
-        COUT(4) << "*** Register Class in " << name << "-Singleton." << std::endl;
+        COUT(4) << "*** ClassIdentifier: Register Class in " << name << "-Singleton." << std::endl;
 
         // Check if at least one object of the given type was created
@@ -236 +236 @@
             this->setName(name);
 
-            COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
+            COUT(4) << "*** ClassIdentifier: Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
             if (bRootClass)
                 this->initialize(NULL); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.
@@ -267 +267 @@
     void ClassIdentifier<T>::addObject(T* object)
     {
-        COUT(4) << "*** Added object to " << this->getName() << "-list." << std::endl;
+        COUT(4) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
         object->getMetaList().add(this->objects_, this->objects_->add(object));
     }
@@ -299 +299 @@
             SubclassIdentifier()
             {
-                std::string name = ClassManager<T>::getName();
-
-                if (name != "unknown")
-                    this->subclassIdentifier_ = ClassManager<T>::getIdentifier(name);
-                else
-                    this->subclassIdentifier_ = 0;
-
-                this->identifier_ = this->subclassIdentifier_;
+                this->identifier_ = ClassManager<T>::getIdentifier();
             }
 
@@ -315 +308 @@
             SubclassIdentifier(Identifier* identifier)
             {
-                std::string name = ClassManager<T>::getName();
-
-                if (name != "unknown")
-                    this->subclassIdentifier_ = ClassManager<T>::getIdentifier(name);
-                else
-                    this->subclassIdentifier_ = 0;
-
                 this->identifier_ = identifier;
             }
@@ -332 +318 @@
             SubclassIdentifier<T>& operator=(Identifier* identifier)
             {
-                if (!identifier->isA(this->subclassIdentifier_))
+                if (!identifier->isA(ClassManager<T>::getIdentifier()))
                 {
-                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << this->subclassIdentifier_->getName() << "!" << std::endl;
-                    COUT(1) << "Error: SubclassIdentifier<" << this->subclassIdentifier_->getName() << "> = Class(" << identifier->getName() << ") is forbidden." << std::endl;
+                    COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
+                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassManager<T>::getIdentifier()->getName() << "!" << std::endl;
+                    COUT(1) << "Error: SubclassIdentifier<" << ClassManager<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden." << std::endl;
                     COUT(1) << "Aborting..." << std::endl;
                     abort();
@@ -380 +367 @@
                     if (this->identifier_)
                     {
-                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << this->subclassIdentifier_->getName() << "!" << std::endl;
+                        COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
+                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassManager<T>::getIdentifier()->getName() << "!" << std::endl;
                         COUT(1) << "Error: Couldn't fabricate a new Object." << std::endl;
                         COUT(1) << "Aborting..." << std::endl;
@@ -386 +374 @@
                     else
                     {
+                        COUT(1) << "An error occurred in SubclassIdentifier:" << std::endl;
                         COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined." << std::endl;
                         COUT(1) << "Aborting..." << std::endl;
@@ -416 +405 @@
         private:
             Identifier* identifier_;            //!< The assigned identifier
-            Identifier* subclassIdentifier_;    //!< The identifier of the subclass
     };
 }