Changeset 9676 in orxonox.OLD for trunk/src/lib/lang/new_object_list.cc

Timestamp:

Aug 21, 2006, 11:09:53 PM (18 years ago)

Author:

bensch

Message:

trunk: Better ID handling, now it is possible, to use pre-defined ID's, as it was with the old appreach

File:

• trunk/src/lib/lang/new_object_list.cc (modified) (5 diffs)

trunk/src/lib/lang/new_object_list.cc

@@ -20 +20 @@
 
 
-NewObjectListBase::NewObjectListBase(const std::string& className)
-    : _id(-1), _name(className)
+NewObjectListBase::NewObjectListBase(const std::string& className, int id)
+    : _name(className)
 {
   if (NewObjectListBase::_classesByID == NULL)
@@ -29 +29 @@
     NewObjectListBase::_classesByName = new classNameMap;
   }
-  assert(!NewObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name/ID (key value)");
+  assert(!NewObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
 
-
-  this->_id = NewObjectListBase::_idCounter++;
+  if (id != -1)
+  {
+    assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
+  }
+  else
+  {
+    this->_id = NewObjectListBase::_classesByID->size();
+  }
 
   (*NewObjectListBase::_classesByID)[this->_id] = this;
@@ -38 +44 @@
 }
 
+
+/**
+ * Destructor.
+ *
+ * This destructor deletes the NewObjectList, and cleans up the NewObjectList sorted Maps.
+ */
 NewObjectListBase::~NewObjectListBase()
 {
@@ -53 +65 @@
 }
 
-int NewObjectListBase::_idCounter = 0;
 NewObjectListBase::classIDMap* NewObjectListBase::_classesByID = NULL;
 NewObjectListBase::classNameMap* NewObjectListBase::_classesByName = NULL;
 
 
+
+/**
+ * @returns the Registered Class Count.
+ */
+unsigned int NewObjectListBase::classCount()
+{
+  assert (NewObjectListBase::_classesByID != NULL);
+  return NewObjectListBase::_classesByID->size();
+};
 
 /**
@@ -67 +87 @@
 {
   return (NewObjectListBase::_classesByName->find(name) != NewObjectListBase::_classesByName->end());
-  //  classNameMap::iterator it;
-  //   for (it = NewObjectListBase::_classesByID->begin(); it != NewObjectListBase::_classesByID->end(); it++)
-  //     if(*it != NULL && (*it)->name() != name)
-  //       return true;
-  //   return false;
+}
+
+/**
+ * @brief Checks if a Class with name already exists.
+ * @param name The Name of the Class to check.
+ * @return true if such a class already exists.
+ */
+bool NewObjectListBase::classIDExists(int id)
+{
+  return (NewObjectListBase::_classesByID->find(id) != NewObjectListBase::_classesByID->end());
 }