Changeset 9606 for code/branches/core6/src/libraries/core/class

Timestamp:

Mar 30, 2013, 7:26:54 PM (12 years ago)

Author:

landauf

Message:

object lists are now stored in a Context object instead of Identifiers

Location:

code/branches/core6/src/libraries/core/class

Files:

• Identifier.cc (modified) (2 diffs)
• Identifier.h (modified) (5 diffs)

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

@@ -52 +52 @@
         : classID_(IdentifierManager::classIDCounter_s++)
     {
-        this->objects_ = new ObjectListBase();
-
         this->bCreatedOneObject_ = false;
         this->bSetName_ = false;
@@ -70 +68 @@
     Identifier::~Identifier()
     {
-        delete this->objects_;
-
         if (this->factory_)
             delete this->factory_;

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

@@ -57 +57 @@
 
     OrxonoxClass* other = object->getIdentifier()->fabricate(0);                // fabricates a new instance of MyClass
-
-
-    // iterate through all objects of type MyClass:
-    ObjectListBase* objects = object->getIdentifier()->getObjects();            // get a pointer to the object-list
-    int count;
-    for (Iterator<MyClass> it = objects.begin(); it != objects.end(); ++it)     // iterate through the objects
-        ++count;
-    orxout() << count << endl;                                                  // prints "2" because we created 2 instances of MyClass so far
 
 
@@ -91 +83 @@
 #include "util/Output.h"
 #include "core/object/ObjectList.h"
-#include "core/object/ObjectListBase.h"
+#include "core/object/Listable.h"
+#include "core/object/Context.h"
 #include "IdentifierManager.h"
 #include "Super.h"
@@ -126 +119 @@
             /// Returns the unique ID of the class.
             ORX_FORCEINLINE unsigned int getClassID() const { return this->classID_; }
-
-            /// Returns the list of all existing objects of this class.
-            inline ObjectListBase* getObjects() const { return this->objects_; }
 
             /// Sets the Factory.
@@ -231 +221 @@
             /// Returns the direct children of the class the Identifier belongs to.
             inline std::set<const Identifier*>& getDirectChildrenIntern() const { return this->directChildren_; }
-
-            ObjectListBase* objects_;                                      //!< The list of all objects of this class
 
         private:
@@ -424 +412 @@
      */
     template <class T>
-    void ClassIdentifier<T>::addObjectToList(T* object, Listable*)
-    {
-        orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
-        object->elements_.push_back(this->objects_->add(object));
+    void ClassIdentifier<T>::addObjectToList(T* object, Listable* listable)
+    {
+        listable->getContext()->addObject(object);
     }