Changeset 239987d for molecuilder/src/Patterns

Timestamp:

Mar 19, 2010, 4:44:08 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

c8d1952

Parents:

9f3025

git-author:

Tillmann Crueger <crueger@…> (03/19/10 16:13:28)

git-committer:

Tillmann Crueger <crueger@…> (03/19/10 16:44:08)

Message:

Improved Observer Framework to include methods to report the state

• bool Observable::isBlocked() will tell if the Observer is currently updating itself
• The Circle detection test now uses ASSERT to report when a circle was detected (can be caught by CPPUNIT)

Location:

molecuilder/src/Patterns

Files:

• Observer.cpp (modified) (5 diffs)
• Observer.hpp (modified) (3 diffs)

molecuilder/src/Patterns/Observer.cpp

@@ -10 +10 @@
 
 #include <iostream>
-#include <cassert>
+
+#include "Helpers/Assert.hpp"
 
 using namespace std;
@@ -127 +128 @@
     // observers, but still we are called by one of our sub-Observables
     // we cannot be sure observation will still work at this point
-    cerr << "Circle detected in observation-graph." << endl;
-    cerr << "Observation-graph always needs to be a DAG to work correctly!" << endl;
-    cerr << "Please check your observation code and fix this!" << endl;
+    ASSERT(0,"Circle detected in observation-graph.\n"
+             "Observation-graph always needs to be a DAG to work correctly!\n"
+             "Please check your observation code and fix this!\n");
     return;
   }
@@ -148 +149 @@
  */
 void Observable::signOn(Observer *target,int priority) {
-  assert(priority>=-20 && priority<=+20 && "Priority out of range [-20:+20]");
+  ASSERT(priority>=-20 && priority<=+20, "Priority out of range [-20:+20] when signing on Observer");
   bool res = false;
   callees_t *callees = 0;
@@ -172 +173 @@
  */
 void Observable::signOff(Observer *target) {
-  assert(callTable.count(this) && "SignOff called for an Observable without Observers.");
+  ASSERT(callTable.count(this),"SignOff called for an Observable without Observers.");
   callees_t *callees = callTable[this];
   callees_t::iterator iter;
@@ -188 +189 @@
     delete callees;
   }
+}
+
+bool Observable::isBlocked(){
+  return depth.count(this) > 0;
 }
 

molecuilder/src/Patterns/Observer.hpp

@@ -95 +95 @@
   virtual void signOff(Observer *target);
 
+  /**
+   * Ask an Observer if it is currently in a blocked state, i.e. if
+   * Changes are in Progress, that are not yet published.
+   */
+  virtual bool isBlocked();
+
 protected:
   virtual void update(Observable *publisher);
@@ -119 +125 @@
   static std::set<Observable*> busyObservables;
 
+  //! @cond
   // Structure for RAII-Style notification
 protected:
@@ -133 +140 @@
     Observable *protege;
   };
+  //! @endcond
 };