Changeset 9602 for code/branches/core6/src/libraries/core

Timestamp:

Mar 29, 2013, 10:37:15 PM (12 years ago)

Author:

landauf

Message:

delete factory before setting a new one (mostly for unit tests)

Location:

code/branches/core6/src/libraries/core

Files:

• class/Identifier.cc (modified) (1 diff)
• class/Identifier.h (modified) (1 diff)
• object/ClassFactory.h (modified) (1 diff)

code/branches/core6/src/libraries/core/class/Identifier.cc

@@ -165 +165 @@
     }
 
+    void Identifier::setFactory(Factory* factory)
+    {
+        if (this->factory_)
+            delete this->factory_;
+
+        this->factory_ = factory;
+    }
+
+
     /**
         @brief Creates an object of the type the Identifier belongs to.

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -131 +131 @@
 
             /// Sets the Factory.
-            inline void addFactory(Factory* factory) { this->factory_ = factory; }
+            void setFactory(Factory* factory);
             /// Returns true if the Identifier has a Factory.
             inline bool hasFactory() const { return (this->factory_ != 0); }

code/branches/core6/src/libraries/core/object/ClassFactory.h

@@ -74 +74 @@
             {
                 orxout(verbose, context::misc::factory) << "Create entry for " << name << " in Factory." << endl;
-                ClassIdentifier<T>::getIdentifier(name)->addFactory(this);
+                ClassIdentifier<T>::getIdentifier(name)->setFactory(this);
                 ClassIdentifier<T>::getIdentifier()->setLoadable(bLoadable);
             }