Changeset 40f2e6

Timestamp:

Dec 13, 2011, 9:46:12 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

2c11c1

Parents:

75d156

git-author:

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

git-committer:

Frederik Heber <heber@…> (12/13/11 09:46:12)

Message:

Observable::signOn() now just needs channelno (enum) and not Notification_ptr.

• this makes life a bit easier and allows for relaying notifications.

Location:

src/Patterns/Observer

Files:

• Observable.cpp (modified) (1 diff)
• Observable.hpp (modified) (2 diffs)
• unittests/ObserverUnitTest.cpp (modified) (3 diffs)
• unittests/stubs/ObserverStub.cpp (modified) (1 diff)

src/Patterns/Observer/Observable.cpp

@@ -273 +273 @@
 }
 
-void Observable::signOn(Observer *target, Notification_ptr notification) const
-{
+void Observable::signOn(Observer *target, size_t channelno) const
+{
+  Notification_ptr notification = getChannel(channelno);
   notification->addObserver(target);
 }
 
-void Observable::signOff(Observer *target, Notification_ptr notification) const
-{
+void Observable::signOff(Observer *target, size_t channelno) const
+{
+  Notification_ptr notification = getChannel(channelno);
   notification->removeObserver(target);
 }

src/Patterns/Observer/Observable.hpp

@@ -74 +74 @@
    * Sign on for specialized notifications
    */
-  virtual void signOn(Observer *target, Notification_ptr notification) const;
+  virtual void signOn(Observer *target, size_t channelno) const;
 
   /**
    * Stop receiving a specialized notification
    */
-  virtual void signOff(Observer *target, Notification_ptr notification) const;
+  virtual void signOff(Observer *target, size_t channelno) const;
 
   /**
@@ -146 +146 @@
 #define PASTE_HELPER(a,b) a ## b
 #define OBSERVE Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(this)
-#define NOTIFY(channelno) do{const ChannelMap::const_iterator iter=NotificationChannels.find(this);ASSERT(iter!=NotificationChannels.end(),"NOTIFY() - channel not found.");Observable::enque_notification_internal(this,iter->second->getChannel(channelno));}while(0)
+#define NOTIFY(channelno) do{Observable::enque_notification_internal(this,NotificationChannels[this]->getChannel(channelno));}while(0)
 #define LOCK_OBSERVABLE(observable) Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(&(observable))
 

src/Patterns/Observer/unittests/ObserverUnitTest.cpp

@@ -160 +160 @@
 
 void ObserverTest::doesNotifyTest(){
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)NotificationObservable::Operation1Notify,
-      notificationObservable->getChannel(NotificationObservable::Operation1Notify)->getChannelNo());
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)NotificationObservable::Operation2Notify,
-      notificationObservable->getChannel(NotificationObservable::Operation2Notify)->getChannelNo());
-  notificationObservable->signOn(notificationObserver1,
-                                 notificationObservable->getChannel(NotificationObservable::Operation1Notify));
-  notificationObservable->signOn(notificationObserver2,
-                                 notificationObservable->getChannel(NotificationObservable::Operation2Notify));
+  notificationObservable->signOn(notificationObserver1, NotificationObservable::Operation1Notify);
+  notificationObservable->signOn(notificationObserver2, NotificationObservable::Operation2Notify);
 
   notificationObservable->operation1();
@@ -180 +172 @@
   CPPUNIT_ASSERT(!notificationObserver1->wasNotified);
   CPPUNIT_ASSERT(notificationObserver2->wasNotified);
-
 }
 
@@ -237 +228 @@
   CPPUNIT_ASSERT_EQUAL( 1, observer2->updates);
 
-
   obsset->signOff(observer1);
   obsmap->signOff(observer2);

src/Patterns/Observer/unittests/stubs/ObserverStub.cpp

@@ -170 +170 @@
 void NotificationObserver::subjectKilled(Observable*){}
 void NotificationObserver::recieveNotification(Observable *publisher, Notification_ptr notification){
-  ASSERT(requestedNotification==notification,"Notification received that was not requested");
+  CPPUNIT_ASSERT(requestedNotification==notification);
   wasNotified = true;
 }