Merge remote-tracking branch 'origin/master' into V9_dev

[modules/yacs.git] / src / engine / Dispatcher.cxx

diff --git a/src/engine/Dispatcher.cxx b/src/engine/Dispatcher.cxx
index 581100bbc0f50de7e00e129d5d5194c68f0bd815..c957e915d67a745b778b65030f569182014b110a 100644 (file)
--- a/src/engine/Dispatcher.cxx
+++ b/src/engine/Dispatcher.cxx
@@ -1,7 +1,29 @@
+// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #include "Dispatcher.hxx"
 #include "Node.hxx"
 #include <iostream>
 
+//#define _DEVDEBUG_
+#include "YacsTrace.hxx"
+
 using namespace YACS::ENGINE;
 
 Observer::~Observer()
@@ -10,7 +32,12 @@ Observer::~Observer()
 
 void Observer::notifyObserver(Node* object, const std::string& event)
 {
-  std::cerr << "notifyObserver " << event << object << std::endl;
+  DEBTRACE("notifyObserver " << event << object );
+}
+
+void Observer::notifyObserver2(Node* object,const std::string& event, void *something)
+{
+  DEBTRACE("notifyObserver2 " << event << object );
 }
 
 Dispatcher* Dispatcher::_singleton = 0;
@@ -52,18 +79,31 @@ void Dispatcher::printObservers()
 
 void Dispatcher::dispatch(Node* object, const std::string& event)
 {
-  //std::cerr << "Dispatcher::dispatch " << event << std::endl;
-  typedef std::set<Observer*>::iterator jt;
+  DEBTRACE("Dispatcher::dispatch " << event );
   std::pair<Node*,std::string> key(object,event);
-  if(_observers.count(key) != 0)
+  std::map< std::pair<Node*,std::string> , std::set<Observer*> >::const_iterator it(_observers.find(key));
+  if(it!=_observers.end())
     {
-      for(jt iter=_observers[key].begin();iter!=_observers[key].end();iter++)
+      for(std::set<Observer*>::const_iterator iter=(*it).second.begin();iter!=(*it).second.end();iter++)
         {
           (*iter)->notifyObserver(object,event);
         }
     }
 }
 
+void Dispatcher::dispatch2(Node* object,const std::string& event, void *something)
+{
+  std::pair<Node*,std::string> key(object,event);
+  std::map< std::pair<Node*,std::string> , std::set<Observer*> >::const_iterator it(_observers.find(key));
+  if(it!=_observers.end())
+    {
+      for(std::set<Observer*>::const_iterator iter=(*it).second.begin();iter!=(*it).second.end();iter++)
+        {
+          (*iter)->notifyObserver2(object,event,something);
+        }
+    }
+}
+
 void Dispatcher::addObserver(Observer* observer,Node* object, const std::string& event)
 {
   _observers[std::pair<Node*,std::string>(object,event)].insert(observer);