Changeset 9702 in orxonox.OLD for branches

Timestamp:

Aug 25, 2006, 11:54:18 AM (18 years ago)

Author:

bensch

Message:

new BaseObjectList retrieval function, thus removing the awefully strange and confusing virutal base_iterator

Location:

branches/new_class_id/src/lib

Files:

• lang/new_object_list.h (modified) (6 diffs)
• shell/shell_command.cc (modified) (1 diff)

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -13 +13 @@
 #include <string>
 #include <iostream>
-
-
 
 /**
@@ -70 +68 @@
   virtual void unregisterObject(IteratorBase* _iterators) = 0;
 
+public:
+  typedef std::list<BaseObject*>            base_list;
+  typedef std::list<BaseObject*>::iterator  base_iterator;
+
+  virtual void getBaseObjectList(base_list* list) const = 0;
+
+  static const NewObjectListBase* const getObjectList(int classID);
+  static const NewObjectListBase* const getObjectList(const std::string& className);
+  static const NewObjectListBase* const getObjectList(const NewClassID& classID);
+
+  static BaseObject* getBaseObject(int classID, const std::string& objectName);
+  static BaseObject* getBaseObject(const std::string& className, const std::string& objectName);
+  static BaseObject* getBaseObject(const NewClassID& classID, const std::string& objectName);
+
+  virtual BaseObject* getBaseObject(const std::string& name) const = 0;
+
 protected:
   NewObjectListBase(const std::string& className, int id = -1);
@@ -80 +94 @@
   static bool classNameExists(const std::string& className);
 
-public:
-  class base_iterator
-  {
-  public:
-    /// @NOTE Do not use this class. For internal handling.
-    class __base_iterator_base
-    {
-    public:
-      virtual void operator++(int) = 0;
-      virtual void operator++() = 0;
-      virtual void operator--(int) = 0;
-      virtual void operator--() = 0;
-      virtual BaseObject* operator*() = 0;
-      virtual __base_iterator_base* operator=(const __base_iterator_base& iterator) = 0;
-      virtual bool operator==(const __base_iterator_base& iterator) const = 0;
-      virtual bool operator!=(const __base_iterator_base& iterator) const = 0;
-      virtual __base_iterator_base* clone() const;
-    };
-
-  public:
-    base_iterator(const __base_iterator_base& it) { _it = it.clone(); };
-    ~base_iterator() { delete _it; }
-    void operator++() { (*_it)++; };
-    void operator++(int) { ++(*_it); };
-    void operator--() { (*_it)--; };
-    void operator--(int) { --(*_it); };
-    BaseObject* operator*() { return *(*_it); };
-    base_iterator& operator=(const base_iterator& iterator);
-    bool operator==(const base_iterator& iter) const { return *this->_it == *iter._it; };
-    bool operator!=(const base_iterator& iter) const { return *this->_it != *iter._it; };
-
-  private:
-    __base_iterator_base*    _it;
-  };
-
-  virtual base_iterator base_begin() const = 0;
-  virtual base_iterator base_end() const = 0;
-
-  static const NewObjectListBase* const getObjectList(int classID);
-  static const NewObjectListBase* const getObjectList(const std::string& className);
-  static const NewObjectListBase* const getObjectList(const NewClassID& classID);
-
-  static BaseObject* getBaseObject(int classID, const std::string& objectName);
-  static BaseObject* getBaseObject(const std::string& className, const std::string& objectName);
-  static BaseObject* getBaseObject(const NewClassID& classID, const std::string& objectName);
-
-  virtual BaseObject* getBaseObject(const std::string& name) const = 0;
 
 protected:
@@ -162 +129 @@
   typedef typename list::iterator        iterator;
   typedef typename list::const_iterator  const_iterator;
-
-  virtual base_iterator base_begin() const { return base_iterator(__base_iterator(this->_objects.begin())); };
-  virtual base_iterator base_end() const { return base_iterator(__base_iterator(this->_objects.end())); };
 
 
@@ -199 +163 @@
 
 protected:
-class __base_iterator : public base_iterator::__base_iterator_base
-  {
-  public:
-    __base_iterator(const const_iterator& iter);
-    void operator++(int) { ++_iter; };
-    void operator++()  { _iter++; };
-    void operator--(int) { --_iter; };
-    void operator--()  { _iter--; };
-    BaseObject* operator*() { return *_iter; };
-    base_iterator::__base_iterator_base* operator=(const __base_iterator_base& iterator) { this->_iter = static_cast<const __base_iterator&>(iterator)._iter; return this; };
-    bool operator==(const __base_iterator_base& iterator) const { return _iter == static_cast<const __base_iterator&>(iterator)._iter; };
-    bool operator!=(const __base_iterator_base& iterator) const { return _iter != static_cast<const __base_iterator&>(iterator)._iter; };
-  private:
-    const_iterator _iter;
-  };
+  virtual void getBaseObjectList(NewObjectListBase::base_list* list) const;
+
 
 private:
@@ -282 +233 @@
 
 /**
+ * @brief retrieves a List of BaseObjects
+ * @param list the list to push the ObjectList into.
+ */
+template <class T>
+void NewObjectList<T>::getBaseObjectList(NewObjectListBase::base_list* list) const
+{
+  assert (list != NULL);
+  const_iterator it;
+  for (it = this->_objects.begin(); it != this->_objects.end(); ++it)
+    list->push_back(*it);
+}
+
+
+/**
  * @brief registers an Object to the NewObjectList.
  * @param T object the Object to register.

branches/new_class_id/src/lib/shell/shell_command.cc

@@ -244 +244 @@
     if (objectList != NULL)
     {
-      NewObjectListBase::base_iterator bo(objectList->base_begin());
+      NewObjectListBase::base_list list;
+      objectList->getBaseObjectList(&list);
+      NewObjectListBase::base_iterator it;
 
       // No Description given (only for speedup)
       if (objectDescriptor.empty())
       {
-        for (; bo != objectList->base_end(); bo++)
-          boList->push_back(*bo);
+        for (it = list.begin(); it != list.end(); it++)
+          boList->push_back(*it);
       }
       // some description
       else
       {
-        for (bo = objectList->base_begin(); bo != objectList->base_end(); bo++)
-          if (!nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
-            boList->push_back(*bo);
+        for (it = list.begin(); it != list.end(); it++)
+          if (!nocaseCmp(objectDescriptor, (*it)->getName(), objectDescriptor.size()))
+            boList->push_back(*it);
       }
     }