Changeset 74e0f7 for src/Patterns/Observer.cpp

Timestamp:

Sep 1, 2011, 11:07:47 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

9e776f

Parents:

451f17

git-author:

Frederik Heber <heber@…> (09/01/11 11:02:49)

git-committer:

Frederik Heber <heber@…> (09/01/11 11:07:47)

Message:

Extended Observables by NotificationChannels member variable.

• new class Channels that aggregates Notifications.
• NOTIFY now just takes a channel number.
• may or may not be instantiated for a given Observable.
• Observable just needs to add enum of all desired channels and addChannel on each of these.
• ObserverUnitTest has been adapted.

File:

• src/Patterns/Observer.cpp (modified) (3 diffs)

src/Patterns/Observer.cpp

@@ -271 +271 @@
 }
 
+Notification_ptr Observable::getChannel(size_t no) const
+{
+  ASSERT(NotificationChannels != NULL,
+      "Observable::getChannel() - observable has no channels.");
+  return NotificationChannels->getChannel(no);
+}
+
 /** Handles sub-observables that just got killed
  *  when an sub-observerable dies we usually don't need to do anything
@@ -350 +357 @@
 
 Notification::Notification(Observable *_owner) :
-    owner(_owner)
+    owner(_owner), channelno(-1)
+{}
+
+Notification::Notification(Observable *_owner, size_t _channelno) :
+    owner(_owner), channelno(_channelno)
 {}
 
@@ -369 +380 @@
   }
 }
+
+Channels::Channels(Observable *_owner) :
+  owner(_owner)
+{}
+
+Channels::~Channels()
+{
+  // free all present Notifications
+  for(NotificationTypetoRefMap::iterator iter = ChannelMap.begin();
+      !ChannelMap.empty(); iter = ChannelMap.begin()) {
+    delete iter->second;
+    ChannelMap.erase(iter);
+  }
+}
+
+void Channels::addChannel(size_t no)
+{
+  NotificationTypetoRefMap::const_iterator iter = ChannelMap.find(no);
+  ASSERT(iter == ChannelMap.end(),
+      "Channels::addChannel() - channel "+toString(int(no))+" is already present in ChannelMap.");
+  ChannelMap.insert( std::make_pair(no, new Notification(owner, no)) );
+}
+
+void Channels::removeChannel(size_t no)
+{
+  NotificationTypetoRefMap::iterator iter = ChannelMap.find(no);
+  ASSERT(iter != ChannelMap.end(),
+      "Channels::removeChannel() - channel "+toString(int(no))+" not present in ChannelMap.");
+  delete iter->second;
+  ChannelMap.erase(iter);
+}
+
+Notification_ptr Channels::getChannel(size_t no) const
+{
+  NotificationTypetoRefMap::const_iterator iter = ChannelMap.find(no);
+  ASSERT(iter != ChannelMap.end(),
+      "Channels::getChannel() - channel "+toString(int(no))+" not present in ChannelMap.");
+  return iter->second;
+}
+
+size_t Channels::getType(Notification_ptr channel) const
+{
+  return channel->getChannelNo();
+}
+
 
 #ifdef LOG_OBSERVER