Changeset e2e035e

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

549b62

Parents:

bc2698

git-author:

Frederik Heber <heber@…> (12/01/11 10:20:57)

git-committer:

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

Message:

Refactored all Observer stuff into own subfolder and split up into distinct modules.

• Observer/all.hpp is all that's needed.

Location:

src

Files:

• Makefile.am (modified) (6 diffs)
• Patterns/Cacheable.hpp (modified) (1 diff)
• Patterns/Observer.hpp (deleted)
• Patterns/Observer/Channels.cpp (added)
• Patterns/Observer/Channels.hpp (added)
• Patterns/Observer/Notification.cpp (added)
• Patterns/Observer/Notification.hpp (added)
• Patterns/Observer/Observable.cpp (moved) (moved from src/Patterns/Observer.cpp ) (19 diffs)
• Patterns/Observer/Observable.hpp (added)
• Patterns/Observer/ObservedContainer.hpp (moved) (moved from src/Patterns/ObservedContainer.hpp ) (1 diff)
• Patterns/Observer/ObservedContainer_impl.hpp (moved) (moved from src/Patterns/ObservedContainer_impl.hpp ) (1 diff)
• Patterns/Observer/ObservedIterator.hpp (moved) (moved from src/Patterns/ObservedIterator.hpp ) (1 diff)
• Patterns/Observer/Observer.cpp (added)
• Patterns/Observer/Observer.hpp (added)
• Patterns/Observer/ObserverLog.cpp (added)
• Patterns/Observer/ObserverLog.hpp (added)
• Patterns/Observer/Relay.cpp (added)
• Patterns/Observer/Relay.hpp (added)
• Patterns/Observer/all.hpp (added)
• Patterns/Observer/defs.hpp (added)
• Patterns/Observer/unittests/Makefile.am (added)
• Patterns/Observer/unittests/ObservedContainerUnitTest.cpp (moved) (moved from src/Patterns/unittests/ObservedContainerUnitTest.cpp ) (1 diff)
• Patterns/Observer/unittests/ObservedContainerUnitTest.hpp (moved) (moved from src/Patterns/unittests/ObservedContainerUnitTest.hpp )
• Patterns/Observer/unittests/ObserverUnitTest.cpp (moved) (moved from src/Patterns/unittests/ObserverUnitTest.cpp ) (1 diff)
• Patterns/Observer/unittests/ObserverUnitTest.hpp (moved) (moved from src/Patterns/unittests/ObserverUnitTest.hpp )
• Patterns/Observer/unittests/stubs/ObserverStub.cpp (moved) (moved from src/Patterns/unittests/stubs/ObserverStub.cpp ) (2 diffs)
• Patterns/Observer/unittests/stubs/ObserverStub.hpp (moved) (moved from src/Patterns/unittests/stubs/ObserverStub.hpp ) (1 diff)
• Patterns/unittests/Makefile.am (modified) (3 diffs)
• documentation/main.dox (modified) (1 diff)
• documentation/patterns/observer.dox (added)
• unittests/Makefile.am (modified) (8 diffs)

src/Makefile.am

@@ -11 +11 @@
 TESTS =
 
+TESTLIBS = \
+        libCodePatterns-debug.la \
+        $(BOOST_THREAD_LIBS)
+
 include Helpers/unittests/Makefile.am
 include Patterns/unittests/Makefile.am
+include Patterns/Observer/unittests/Makefile.am
 include unittests/Makefile.am
 
@@ -33 +38 @@
 
 PATTERNSOURCE = \
-        Patterns/ObservedContainer_impl.hpp \
-        Patterns/Registry_impl.hpp \
-        Patterns/Singleton_impl.hpp
+        Patterns/Observer/Channels.cpp \
+        Patterns/Observer/Notification.cpp \
+        Patterns/Observer/Observable.cpp \
+        Patterns/Observer/Observer.cpp \
+        Patterns/Observer/ObserverLog.cpp
 PATTERNHEADER = \
         Patterns/Cacheable.hpp \
@@ -46 +53 @@
         Patterns/ManipulablePrototypeFactory.hpp \
         Patterns/ManipulablePrototypeFactory_impl.hpp \
-        Patterns/ObservedContainer.hpp \
-        Patterns/ObservedIterator.hpp \
-        Patterns/Observer.hpp \
+        Patterns/Observer/Channels.hpp \
+        Patterns/Observer/defs.hpp \
+        Patterns/Observer/Notification.hpp \
+        Patterns/Observer/Observable.hpp \
+        Patterns/Observer/Observer.hpp \
+        Patterns/Observer/ObservedContainer.hpp \
+        Patterns/Observer/ObserverLog.hpp \
+        Patterns/Observer/ObservedIterator.hpp \
+        Patterns/Observer/ObservedContainer_impl.hpp \
+        Patterns/Registry_impl.hpp \
+        Patterns/Singleton_impl.hpp \
         Patterns/PrototypeFactory.hpp \
         Patterns/PrototypeFactory_impl.hpp \
@@ -61 +76 @@
 # this includes source files that need to be present at multiple points
 HELPERSSOURCE =  \
-        Patterns/Observer.cpp \
         Helpers/Assert.cpp \
         Helpers/Chronos.cpp \
@@ -106 +120 @@
 ## which are already listed elsewhere in a _HEADERS variable assignment.
 #-$(CODEPATTERNS_API_VERSION)
-libCodePatterns_la_SOURCES = ${HELPERSSOURCE}
-libCodePatterns_debug_la_SOURCES = ${HELPERSSOURCE}
+libCodePatterns_la_SOURCES = $(HELPERSSOURCE) $(PATTERNSOURCE) 
+libCodePatterns_debug_la_SOURCES = $(HELPERSSOURCE) $(PATTERNSOURCE) 
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -129 +143 @@
 libCodePatterns_libincludedir = $(includedir)/CodePatterns/
 #-$(CODEPATTERNS_API_VERSION)
-libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(PATTERNSOURCE) $(PATTERNHEADER) $(top_builddir)/libCodePatterns_config.h
+libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(PATTERNHEADER) $(top_builddir)/libCodePatterns_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for

src/Patterns/Cacheable.hpp

@@ -14 +14 @@
 #endif
 
-#include "Observer.hpp"
+#include "Observer/Observable.hpp"
+#include "Observer/Observer.hpp"
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>

src/Patterns/Observer/Observable.cpp

@@ -7 +7 @@
 
 /*
- * Observer.cpp
- *
- *  Created on: Jan 19, 2010
- *      Author: crueger
+ * Observable.cpp
+ *
+ *  Created on: Dec 1, 2011
+ *      Author: heber
  */
 
@@ -20 +20 @@
 #include "MemDebug.hpp"
 
-#include "Observer.hpp"
-
-#include <iostream>
-
 #include "Assert.hpp"
-#include "MemDebug.hpp"
-
-using namespace std;
-
-/****************** Static stuff for the observer mechanism ************/
+#include "Channels.hpp"
+#include "Notification.hpp"
+#include "Observable.hpp"
+
 
 // All infrastructure for the observer-pattern is bundled at a central place
@@ -39 +34 @@
 // See [Gamma et al, 1995] p. 297
 
-map<Observable*, int> Observable::depth;  //!< Map of Observables to the depth of the DAG of Observers
-map<Observable*,multimap<int,Observer*> > Observable::callTable; //!< Table for each Observable of all its Observers
+std::map<Observable*, int> Observable::depth;  //!< Map of Observables to the depth of the DAG of Observers
+std::map<Observable*,std::multimap<int,Observer*> > Observable::callTable; //!< Table for each Observable of all its Observers
 std::map<Observable*,std::set<Notification*> > Observable::notifications;
-set<Observable*> Observable::busyObservables; //!< Set of Observables that are currently busy notifying their sign-on'ed Observers
+std::set<Observable*> Observable::busyObservables; //!< Set of Observables that are currently busy notifying their sign-on'ed Observers
 Observable::ChannelMap Observable::NotificationChannels; //!< Map of Observables to their Channels.
 
@@ -59 +54 @@
   // by the STL and initialized to 0 (see STL documentation)
 #ifdef LOG_OBSERVER
-  observerLog().addMessage(depth[publisher]) << ">> Locking " << observerLog().getName(publisher) << endl;
+  observerLog().addMessage(depth[publisher]) << ">> Locking " << observerLog().getName(publisher) << std::endl;
 #endif
   depth[publisher]++;
@@ -80 +75 @@
   --depth[publisher];
 #ifdef LOG_OBSERVER
-  observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher) << endl;
+  observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher) << std::endl;
 #endif
   if(depth[publisher]){}
@@ -92 +87 @@
 
 void Observable::enque_notification_internal(Observable *publisher, Notification_ptr notification){
-  ASSERT(notification->owner==publisher,"Some object tried to send a notification it does not own");
   notifications[publisher].insert(notification);
 }
@@ -148 +142 @@
         observerLog().addMessage() << "-> Sending update from " << observerLog().getName(this)
                                    << " to " << observerLog().getName((*iter).second)
-                                   << " (priority=" << (*iter).first << ")"<< endl;
+                                   << " (priority=" << (*iter).first << ")"<< std::endl;
 #endif
         (*iter).second->update(this);
@@ -161 +155 @@
   for(notificationSet::iterator it = currentNotifications.begin();
       it != currentNotifications.end();++it){
-    (*it)->notifyAll();
+    (*it)->notifyAll(this);
   }
 
@@ -194 +188 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-* Update from " << observerLog().getName(publisher)
-                                 << " propagated by " << observerLog().getName(this) << endl;
+                                 << " propagated by " << observerLog().getName(this) << std::endl;
 #endif
       notifyAll();
@@ -201 +195 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-| Update from " <<  observerLog().getName(publisher)
-                                 << " not propagated by " << observerLog().getName(this) << endl;
+                                 << " not propagated by " << observerLog().getName(this) << std::endl;
 #endif
     }
@@ -214 +208 @@
 void Observable::signOn(Observer *target,int priority) const
 {
-  ASSERT(priority>=-20 && priority<=+20, "Priority out of range [-20:+20] when signing on Observer");
-#ifdef LOG_OBSERVER
-  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target) << " to " << observerLog().getName(const_cast<Observable *>(this)) << endl;
+  ASSERT(priority>=-20 && priority<=+20,
+      "Priority out of range [-20:+20] when signing on Observer");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target) << " to " << observerLog().getName(const_cast<Observable *>(this)) << std::endl;
 #endif
   bool res = false;
@@ -226 +221 @@
   }
   if(!res)
-    callees.insert(pair<int,Observer*>(priority,target));
+    callees.insert(std::pair<int,Observer*>(priority,target));
 }
 
@@ -235 +230 @@
 void Observable::signOff(Observer *target) const
 {
-  ASSERT(callTable.count(const_cast<Observable *>(this)),"SignOff called for an Observable without Observers.");
-#ifdef LOG_OBSERVER
-  observerLog().addMessage() << "** Signing off " << observerLog().getName(target) << " from " << observerLog().getName(const_cast<Observable *>(this)) << endl;
+  ASSERT(callTable.count(const_cast<Observable *>(this)),
+      "SignOff called for an Observable without Observers.");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "** Signing off " << observerLog().getName(target) << " from " << observerLog().getName(const_cast<Observable *>(this)) << std::endl;
 #endif
   callees_t &callees = callTable[const_cast<Observable *>(this)];
@@ -258 +254 @@
 void Observable::signOn(Observer *target, Notification_ptr notification) const
 {
-  ASSERT(notification->owner==this,
-         "Trying to sign on for a notification that is not provided by this object");
-
   notification->addObserver(target);
 }
@@ -266 +259 @@
 void Observable::signOff(Observer *target, Notification_ptr notification) const
 {
-  ASSERT(notification->owner==this,
-         "Trying to sign off from a notification that is not provided by this object");
-
   notification->removeObserver(target);
 }
@@ -279 +269 @@
 Notification_ptr Observable::getChannel(size_t no) const
 {
-  ChannelMap::iterator iter = NotificationChannels.find(const_cast<Observable *>(this));
+  const ChannelMap::const_iterator iter = NotificationChannels.find(const_cast<Observable * const>(this));
   ASSERT(iter != NotificationChannels.end(),
       "Observable::getChannel() - we do not have a channel in NotificationChannels.");
@@ -297 +287 @@
 /** Constructor for class Observable.
  */
-Observable::Observable(string name) :
+Observable::Observable(std::string name) :
   Observer(Observer::BaseConstructor())
 {
 #ifdef LOG_OBSERVER
   observerLog().addName(this,name);
-  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this) << endl;
+  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this) << std::endl;
 #endif
 }
@@ -312 +302 @@
 {
 #ifdef LOG_OBSERVER
-  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this) << endl;
+  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this) << std::endl;
 #endif
   if(callTable.count(this)) {
@@ -324 +314 @@
   }
 }
-
-/** Constructor for class Observer.
- */
-Observer::Observer(string name)
-{
-#ifdef LOG_OBSERVER
-  observerLog().addName(this,name);
-  observerLog().addMessage() << "++ Creating Observer " << observerLog().getName(this) << endl;
-#endif
-}
-
-/**
- * Base Constructor for class Observer
- *
- * only called from Observable Constructor
- */
-Observer::Observer(Observer::BaseConstructor){
-#ifdef LOG_OBSERVER
-  observerLog().addObservable(this);
-#endif
-}
-
-/** Destructor for class Observer.
- */
-Observer::~Observer()
-{
-#ifdef LOG_OBSERVER
-  if(!observerLog().isObservable(this)){
-    observerLog().addMessage() << "-- Destroying Observer " << observerLog().getName(this) << endl;
-  }
-#endif
-}
-
-/**
- * Method for specialized notifications.
- * Most Observers wont need or use this, so it is implemented
- * empty in the base case;
- */
-void Observer::recieveNotification(Observable *publisher, Notification_ptr notification){
-  ASSERT(0,"Notification received by object that did not sign on for it.");
-}
-
-Notification::Notification(Observable *_owner) :
-    owner(_owner), channelno(-1)
-{}
-
-Notification::Notification(Observable *_owner, size_t _channelno) :
-    owner(_owner), channelno(_channelno)
-{}
-
-Notification::~Notification(){}
-
-void Notification::addObserver(Observer *target){
-  targets.insert(target);
-}
-
-void Notification::removeObserver(Observer *target){
-  targets.erase(target);
-}
-
-void Notification::notifyAll(){
-  for(std::set<Observer*>::iterator it=targets.begin();
-      it!=targets.end();++it){
-    (*it)->recieveNotification(owner,this);
-  }
-}
-
-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
-
-/************************* Methods to do logging of the Observer Mechanism *********/
-
-// The log needs to exist fairly early, so we make it construct on first use,
-// and never destroy it
-ObserverLog &observerLog(){
-  // yes, this memory is never freed... we need it around for the whole programm,
-  // so no freeing is possible
-  static ObserverLog *theLog = Memory::ignore(new ObserverLog());
-  return *theLog;
-}
-
-
-ObserverLog::ObserverLog() :
-  count (0)
-{}
-
-ObserverLog::~ObserverLog(){}
-
-string ObserverLog::getLog(){return log.str();}
-
-std::string ObserverLog::getName(void* obj){
-  return names[obj];
-}
-
-bool ObserverLog::isObservable(void* obj){
-  return observables.count(obj);
-}
-
-void ObserverLog::addName(void* obj , string name){
-  stringstream sstr;
-  sstr << name << "_" << count++;
-  names[obj] = sstr.str();
-}
-
-void ObserverLog::addObservable(void* obj){
-  observables.insert(obj);
-}
-
-void ObserverLog::deleteName(void* obj){
-  names.erase(obj);
-}
-
-void ObserverLog::deleteObservable(void* obj){
-  observables.erase(obj);
-}
-
-stringstream &ObserverLog::addMessage(int depth){
-  for(int i=depth;i--;)
-    log << "  ";
-  return log;
-}
-
-#endif

src/Patterns/Observer/ObservedContainer.hpp

@@ -15 +15 @@
 
 #include <utility>
-#include "ObservedIterator.hpp"
+#include "Observer/ObservedIterator.hpp"
 
 /**

src/Patterns/Observer/ObservedContainer_impl.hpp

@@ -14 +14 @@
 #endif
 
-#include "ObservedContainer.hpp"
+#include "Observer/ObservedContainer.hpp"
 
 template <class Container>

src/Patterns/Observer/ObservedIterator.hpp

@@ -14 +14 @@
 #endif
 
-#include "Observer.hpp"
+#include "Observer/Observer.hpp"
 
 #include <iterator>

src/Patterns/Observer/unittests/ObservedContainerUnitTest.cpp

@@ -28 +28 @@
 
 #include "stubs/ObserverStub.hpp"
-#include "ObservedContainer.hpp"
-#include "ObservedContainer_impl.hpp"
+#include "Observer/ObservedContainer.hpp"
+#include "Observer/ObservedContainer_impl.hpp"
 
 #include "ObservedContainerUnitTest.hpp"

src/Patterns/Observer/unittests/ObserverUnitTest.cpp

@@ -28 +28 @@
 
 #include "stubs/ObserverStub.hpp"
-#include "ObservedContainer.hpp"
-#include "ObservedContainer_impl.hpp"
+#include "Observer/Notification.hpp"
+#include "Observer/ObservedContainer.hpp"
+#include "Observer/ObservedContainer_impl.hpp"
 
 #include "ObserverUnitTest.hpp"

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

@@ -24 +24 @@
 #include "ObserverStub.hpp"
 
+#include "Observer/Channels.hpp"
+#include "Observer/Notification.hpp"
+
 /************ UpdateCountObserver **************/
 
@@ -132 +135 @@
   Observable("NotificationObservable")
 {
-  Channels *OurChannel = new Channels(this);
+  Channels *OurChannel = new Channels();
   NotificationChannels.insert( std::make_pair(this, OurChannel) );
   OurChannel->addChannel(Operation1Notify);

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

@@ -9 +9 @@
 #define OBSERVERSTUB_HPP_
 
-#include "Observer.hpp"
-#include "ObservedIterator.hpp"
+#include "Observer/Observer.hpp"
+#include "Observer/Observable.hpp"
+#include "Observer/ObservedIterator.hpp"
 
 class UpdateCountObserver : public Observer {

src/Patterns/unittests/Makefile.am

@@ -11 +11 @@
   ManipulableCloneUnitTest \
   ManipulablePrototypeFactoryUnitTest \
-  ObservedContainerUnitTest \
-  ObserverUnitTest \
   PrototypeFactoryUnitTest \
   RegistryUnitTest \
@@ -20 +18 @@
 check_PROGRAMS += $(TESTS) 
 noinst_PROGRAMS += $(TESTS)
-
-TESTLIBS = \
-        libCodePatterns-debug.la \
-        $(BOOST_THREAD_LIBS)
 
 CacheableUnitTest_SOURCES = unittests/UnitTestMain.cpp \
@@ -95 +89 @@
 ManipulablePrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
 
-ObserverUnitTest_SOURCES = unittests/UnitTestMain.cpp \
-        Patterns/unittests/ObserverUnitTest.cpp \
-        Patterns/unittests/ObserverUnitTest.hpp \
-        Patterns/unittests/stubs/ObserverStub.cpp \
-        Patterns/unittests/stubs/ObserverStub.hpp
-nodist_ObserverUnitTest_SOURCES = \
-        Patterns/Observer.hpp \
-        Patterns/ObserverContainer.hpp \
-        Patterns/ObserverContainer_impl.hpp \
-        Patterns/ObserverIterator.hpp
-ObserverUnitTest_LDADD = $(TESTLIBS)
-
-ObservedContainerUnitTest_SOURCES = unittests/UnitTestMain.cpp \
-        Patterns/unittests/ObservedContainerUnitTest.cpp \
-        Patterns/unittests/ObservedContainerUnitTest.hpp \
-        Patterns/unittests/stubs/ObserverStub.cpp \
-        Patterns/unittests/stubs/ObserverStub.hpp
-nodist_ObservedContainerUnitTest_SOURCES = \
-        Patterns/ObserverContainer.hpp \
-        Patterns/ObserverContainer_impl.hpp
-ObservedContainerUnitTest_LDADD = $(TESTLIBS)
-
 PrototypeFactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
         Patterns/unittests/PrototypeFactoryUnitTest.cpp \

src/documentation/main.dox

@@ -42 +42 @@
  *  - \ref ManipulablePrototypeFactory - contains table of clones or prototypes
  *    and spawns new \a manipulated instances on user request.
- *  - \ref Observer - class can observe changes in other class via this
+ *  - \ref pattern-observer - class can observe changes in other class via this
  *    interface.
  *  - \ref PrototypeFactory - contains table of clones or prototypes and spawns

src/unittests/Makefile.am

@@ -13 +13 @@
   Helpers/unittests/LogUnitTest.cpp \
   Helpers/unittests/RangeUnitTest.cpp \
+  Patterns/Observer/unittests/ObserverUnitTest.cpp \
+  Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
+  Patterns/Observer/unittests/stubs/ObserverStub.cpp \
   Patterns/unittests/CacheableUnitTest.cpp \
   Patterns/unittests/CloneUnitTest.cpp \
@@ -19 +22 @@
   Patterns/unittests/ManipulableCloneUnitTest.cpp \
   Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
-  Patterns/unittests/ObserverUnitTest.cpp \
   Patterns/unittests/PrototypeFactoryUnitTest.cpp \
   Patterns/unittests/RegistryUnitTest.cpp \
@@ -29 +31 @@
   Patterns/unittests/stubs/ManipulableCloneStub.cpp \
   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
-  Patterns/unittests/stubs/ObserverStub.cpp \
   Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
   Patterns/unittests/stubs/RegistryStub.cpp
@@ -39 +40 @@
   Helpers/unittests/LogUnitTest.hpp \
   Helpers/unittests/RangeUnitTest.hpp \
+  Patterns/unittests/Observer/ObserverUnitTest.hpp \
+  Patterns/unittests/Observer/ObservedContainerUnitTest.hpp \
+  Patterns/unittests/stubs/Observer/ObserverStub.hpp \
   Patterns/unittests/CacheableUnitTest.hpp \
   Patterns/unittests/CloneUnitTest.hpp \
@@ -45 +49 @@
   Patterns/unittests/ManipulableCloneUnitTest.hpp \
   Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
-  Patterns/unittests/ObserverUnitTest.hpp \
   Patterns/unittests/PrototypeFactoryUnitTest.hpp \
   Patterns/unittests/RegistryUnitTest.hpp \
@@ -62 +65 @@
   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
-  Patterns/unittests/stubs/ObserverStub.hpp \
   Patterns/unittests/stubs/PrototypeFactoryStub.def \
   Patterns/unittests/stubs/PrototypeFactoryStub.undef \
@@ -72 +74 @@
         $(TESTHEADERS)
 nodist_TestRunner_SOURCES = \
+        Patterns/Observer/Channels.hpp \
+        Patterns/Observer/defs.hpp \
+        Patterns/Observer/Notification.hpp \
+        Patterns/Observer/Observable.hpp \
+        Patterns/Observer/Observer.hpp \
+        Patterns/Observer/ObserverLog.hpp \
+        Patterns/Observer/ObservedContainer_impl.hpp \
+        Patterns/Observer/ObservedContainer.hpp \
+        Patterns/Observer/ObserverIterator.hpp \
         Patterns/Cachable.hpp \
         Patterns/Clone.hpp \
@@ -81 +92 @@
         Patterns/ManipulablePrototypeFactory_impl.hpp \
         Patterns/ManipulablePrototypeFactory.hpp \
-        Patterns/ObservedContainer_impl.hpp \
-        Patterns/ObservedContainer.hpp \
-        Patterns/Observer.hpp \
-        Patterns/ObserverIterator.hpp \
         Patterns/PrototypeFactory_impl.hpp \
         Patterns/PrototypeFactory.hpp \