Changeset 2074 for code/branches

Timestamp:

Oct 31, 2008, 3:31:21 AM (16 years ago)

Author:

landauf

Message:

• added EventListener: this class fires an event if another class with a specified name fires
• added EventDispatcher: this class dispatches events to several other classes (EventTarget) if it gets an event itself
• added EventTarget: used in EventDispatcher to access all classes with a specified name
• added XMLNameListener: this listener gets called every time a new class was loaded through XML with a name != "". used to find classes with a given name even if they're not existing at the moment.

Location:

code/branches/objecthierarchy/src

Files:

• core/BaseObject.cc (modified) (7 diffs)
• core/BaseObject.h (modified) (2 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/XMLNameListener.cc (added)
• core/XMLNameListener.h (added)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/objects/EventDispatcher.cc (added)
• orxonox/objects/EventDispatcher.h (added)
• orxonox/objects/EventListener.cc (added)
• orxonox/objects/EventListener.h (added)
• orxonox/objects/EventTarget.cc (added)
• orxonox/objects/EventTarget.h (added)

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -38 +38 @@
 #include "XMLPort.h"
 #include "XMLFile.h"
+#include "XMLNameListener.h"
 #include "Template.h"
 #include "util/String.h"
@@ -81 +82 @@
     {
         for (std::list<BaseObject*>::const_iterator it = this->events_.begin(); it != this->events_.end(); ++it)
-            (*it)->eventListeners_.erase(this);
+            (*it)->unregisterEventListener(this);
+
+        for (std::map<BaseObject*, std::string>::const_iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
+            it->first->removeEvent(this);
     }
 
@@ -92 +96 @@
     void BaseObject::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, mode);
+        XMLPortParam(BaseObject, "name", setXMLName, getName, xmlelement, mode);
         XMLPortParam(BaseObject, "visible", setVisible, isVisible, xmlelement, mode);
         XMLPortParam(BaseObject, "active", setActive, isActive, xmlelement, mode);
@@ -135 +139 @@
 
     /**
+        @brief Loads the name of the object through XML and calls all XMLNameListener.
+        @param name The name of the object
+    */
+    void BaseObject::setXMLName(const std::string& name)
+    {
+        this->setName(name);
+
+        for (ObjectList<XMLNameListener>::iterator it = ObjectList<XMLNameListener>::begin(); it != ObjectList<XMLNameListener>::end(); ++it)
+            it->loadedNewXMLName(this);
+    }
+
+    /**
         @brief Returns the levelfile that loaded this object.
         @return The levelfile
@@ -187 +203 @@
     void BaseObject::addEvent(BaseObject* event, const std::string& sectionname)
     {
-        event->eventListeners_[this] = sectionname;
+        event->registerEventListener(this, sectionname);
         this->events_.push_back(event);
+    }
+
+    void BaseObject::removeEvent(BaseObject* event)
+    {
+        this->events_.remove(event);
     }
 
@@ -232 +253 @@
     void BaseObject::fireEvent(bool activate)
     {
-        Event event(activate, this);
+        this->fireEvent(activate, this);
+    }
+
+    void BaseObject::fireEvent(bool activate, BaseObject* originator)
+    {
+        Event event(activate, originator);
 
         for (std::map<BaseObject*, std::string>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
@@ -241 +267 @@
     }
 
+    void BaseObject::fireEvent(Event& event)
+    {
+        for (std::map<BaseObject*, std::string>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
+            it->first->processEvent(event);
+    }
+
     void BaseObject::processEvent(Event& event)
     {

code/branches/objecthierarchy/src/core/BaseObject.h

@@ -115 +115 @@
             void fireEvent();
             void fireEvent(bool activate);
+            void fireEvent(bool activate, BaseObject* originator);
+            void fireEvent(Event& event);
 
             virtual void processEvent(Event& event);
 
+            inline void registerEventListener(BaseObject* object, const std::string& sectionname)
+                { this->eventListeners_[object] = sectionname; }
+            inline void unregisterEventListener(BaseObject* object)
+                { this->eventListeners_.erase(object); }
+
             void addEvent(BaseObject* event, const std::string& sectionname);
+            void removeEvent(BaseObject* event);
             BaseObject* getEvent(unsigned int index) const;
 
@@ -136 +144 @@
 
         private:
+            void setXMLName(const std::string& name);
             Template* getTemplate(unsigned int index) const;
 

code/branches/objecthierarchy/src/core/CMakeLists.txt

@@ -34 +34 @@
   Template.cc
   XMLPort.cc
+  XMLNameListener.cc
 
   # shell

code/branches/objecthierarchy/src/core/CorePrereqs.h

@@ -155 +155 @@
   class Tickable;
   class XMLFile;
+  class XMLNameListener;
   template <class T, class O>
   class XMLPortClassObjectContainer;

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -43 +43 @@
   tools/WindowEventListener.cc
 
+  objects/EventListener.cc
+  objects/EventDispatcher.cc
+  objects/EventTarget.cc
   objects/Radar.cc
   objects/RadarListener.cc

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -112 +112 @@
     class EventTrigger;
 
+    class EventListener;
+    class EventDispatcher;
+    class EventTarget;
+
     class Controller;
     class HumanController;