Changeset d85532 for src/Patterns/Observer/Relay.cpp

Timestamp:

Dec 13, 2011, 12:00:30 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

b760ac5

Parents:

2c11c1

git-author:

Frederik Heber <heber@…> (12/02/11 10:10:17)

git-committer:

Frederik Heber <heber@…> (12/13/11 12:00:30)

Message:

Added unit test on Relay.

• added new stubs to ObserverStub implementing Relay.
• Relay is friend of Notification.

File:

• src/Patterns/Observer/Relay.cpp (modified) (6 diffs)

src/Patterns/Observer/Relay.cpp

@@ -22 +22 @@
 #include "Relay.hpp"
 
+#include "Assert.hpp"
+#include "Channels.hpp"
+#include "defs.hpp"
+#include "Notification.hpp"
+
 
 /** Constructor for class Relay.
  */
-Relay::Relay(string name) :
-  Observer(Observer::BaseConstructor())
+Relay::Relay(std::string name) :
+  Observable(name),
+  Updater(NULL)
 {
 #ifdef LOG_OBSERVER
@@ -42 +48 @@
   observerLog().addMessage() << "-- Destroying Relay " << observerLog().getName(this);
 #endif
-  if(callTable.count(this)) {
-    // delete all entries for this observable
-    callees_t callees = callTable[this];
-    callees_t::iterator iter;
-    for(iter=callees.begin();iter!=callees.end();++iter){
-      (*iter).second->subjectKilled(this);
-    }
-    callTable.erase(this);
-  }
 }
 
 
 /** Notify all Observers of changes.
- * Puts \a *this into Relay::busyRelays, calls Observer::update() for all in callee_t
+ * Puts \a *this into Relay::busyObservables, calls Observer::update() for all in callee_t
  * and removes from busy list.
  */
 void Relay::notifyAll() {
+  ASSERT(Updater != NULL,
+      "Relay::notifyAll() called while Updater is NULL.");
   // we are busy notifying others right now
   // add ourselves to the list of busy subjects to enable circle detection
-  busyRelays.insert(this);
+  busyObservables.insert(this);
   // see if anyone has signed up for observation
   // and call all observers
@@ -86 +85 @@
   // send out all notifications that need to be done
 
-  notificationSet currentNotifications = notifications[this];
+  notificationSet currentNotifications = notifications[Updater];
   for(notificationSet::iterator it = currentNotifications.begin();
       it != currentNotifications.end();++it){
-    (*it)->notifyAll();
+    (*it)->notifyAll(Updater);
   }
 
-  notifications.erase(this);
+  notifications.erase(Updater);
 
    // done with notification, we can leave the set of busy subjects
-  busyRelays.erase(this);
+  busyObservables.erase(this);
 }
 
@@ -106 +105 @@
 void Relay::update(Observable *publisher) {
   // circle detection
-  if(busyRelays.find(this)!=busyRelays.end()) {
+  if(busyObservables.find(this)!=busyObservables.end()) {
     // somehow a circle was introduced... we were busy notifying our
     // observers, but still we are called by one of our sub-Relays
@@ -122 +121 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-* Update from " << observerLog().getName(publisher)
-                                 << " relayed by " << observerLog().getName(this) << endl;
+                                 << " relayed by " << observerLog().getName(this);
 #endif
       Updater = publisher;
@@ -130 +129 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-| Update from " <<  observerLog().getName(publisher)
-                                 << " not relayed by " << observerLog().getName(this) << endl;
+                                 << " not relayed by " << observerLog().getName(this);
 #endif
     }