Changeset 74e0f7 for src/Patterns/unittests/stubs/ObserverStub.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/unittests/stubs/ObserverStub.cpp (modified) (3 diffs)

src/Patterns/unittests/stubs/ObserverStub.cpp

@@ -31 +31 @@
 {};
 
+UpdateCountObserver::~UpdateCountObserver()
+{}
+
 void UpdateCountObserver::update(Observable *publisher){
   updates++;
@@ -127 +130 @@
 
 NotificationObservable::NotificationObservable() :
-  Observable("NotificationObservable"),
-  notification1(new Notification(this)),
-  notification2(new Notification(this))
-{}
-
-NotificationObservable::~NotificationObservable(){
-  delete notification1;
-  delete notification2;
+  Observable("NotificationObservable")
+{
+  NotificationChannels = new Channels(this);
+  NotificationChannels->addChannel(Operation1Notify);
+  NotificationChannels->addChannel(Operation2Notify);
+}
+
+NotificationObservable::~NotificationObservable()
+{
+  delete NotificationChannels;
 }
 
 void NotificationObservable::operation1(){
   OBSERVE;
-  NOTIFY(notification1);
+  NOTIFY(Operation1Notify);
 }
 
 void NotificationObservable::operation2(){
   OBSERVE;
-  NOTIFY(notification2);
+  NOTIFY(Operation2Notify);
 }
 
@@ -153 +158 @@
   requestedNotification(notification),
   wasNotified(false)
+{}
+
+NotificationObserver::~NotificationObserver()
 {}