Changeset 5778 for code/branches/core5/src/libraries/core/ClassFactory.h

Timestamp:

Sep 24, 2009, 2:47:53 AM (16 years ago)

Author:

landauf

Message:

Removed the Factory class.
Moved the networkID↔Identifier map from Factory to Identifier.
Replaced the name↔Identifier map from Factory with the already existing Identifier map in Identifier. This map additionally contains Identifiers without Factory. You can separate them with the new function identifier→hasFactory().

File:

• code/branches/core5/src/libraries/core/ClassFactory.h (modified) (3 diffs)

code/branches/core5/src/libraries/core/ClassFactory.h

@@ -42 +42 @@
 
 #include "util/Debug.h"
-#include "Factory.h"
 #include "Identifier.h"
 
@@ -71 +70 @@
 
     /**
-        @brief Adds the ClassFactory to the Identifier of the same type and the Identifier to the Factory.
+        @brief Adds the ClassFactory to the Identifier of the same type.
         @param name The name of the class
         @param bLoadable True if the class can be loaded through XML
-        @return Always true (this is needed because the compiler only allows assignments before main())
     */
     template <class T>
@@ -82 +80 @@
         ClassIdentifier<T>::getIdentifier(name)->addFactory(this);
         ClassIdentifier<T>::getIdentifier()->setLoadable(bLoadable);
-        Factory::add(name, ClassIdentifier<T>::getIdentifier());
     }