Changeset 5882 for code/branches/core5/src/modules

Timestamp:

Oct 5, 2009, 9:57:05 PM (15 years ago)

Author:

landauf

Message:

Again some changes in the event-system:

• Added "mainstate" event-state to BaseObject. It leads to the state which was defined with the mainstate attribute in XML.
• Support event-forwarding to the mainstate of event-listeners.
• The "targets" subsection of the EventDispatcher now supports all kinds of objects (not just EventTargets).
• EventTarget now works in all places of the XML-file, not just in the "targets" section of EventDispatcher.

Added a sample XML-file which explains several aspects of the event-system.

Location:

code/branches/core5/src/modules/objects/eventsystem

Files:

• EventDispatcher.cc (modified) (2 diffs)
• EventTarget.cc (modified) (1 diff)
• EventTarget.h (modified) (1 diff)

code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -54 +54 @@
         SUPER(EventDispatcher, XMLPort, xmlelement, mode);
 
-        XMLPortObject(EventDispatcher, EventTarget, "targets", addTarget, getTarget, xmlelement, mode);
+        XMLPortObject(EventDispatcher, BaseObject, "targets", addTarget, getTarget, xmlelement, mode);
     }
 
@@ -60 +60 @@
     {
         for (std::list<EventTarget*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
-            (*it)->fireEvent(event);
+            (*it)->processEvent(event);
     }
 

code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc

@@ -42 +42 @@
     {
     }
+    
+    void EventTarget::processEvent(Event& event)
+    {
+        this->fireEvent(event);
+    }
 
     void EventTarget::changedName()

code/branches/core5/src/modules/objects/eventsystem/EventTarget.h

@@ -42 +42 @@
             EventTarget(BaseObject* creator);
             virtual ~EventTarget();
+            
+            virtual void processEvent(Event& event);
 
             virtual void changedName();