CCAR: add a notifier object in SALOMEDS so that CORBA is no more called in SALOMEDSImpl

diff --git a/src/SALOMEDS/SALOMEDS_Study.cxx b/src/SALOMEDS/SALOMEDS_Study.cxx
index de2f8bba45a3522091a0a7ff6cb60f968ab1c9fc..43c7932a1f475eeb25839e11da0dc7c788b47096 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study.cxx
@@ -1002,12 +1002,7 @@ _PTR(AttributeParameter) SALOMEDS_Study::GetModuleParameters(const std::string&
 
 void SALOMEDS_Study::attach(SALOME::Observer_ptr theObserver)
 {
-  if (_isLocal) {
-    SALOMEDS::Locker lock;
-    _local_impl->attach(theObserver);
-  }
-  else {
-    _corba_impl->attach(theObserver);
-  }
+  if(CORBA::is_nil(_corba_impl)) GetStudy(); //If CORBA implementation is null then retrieve it
+  _corba_impl->attach(theObserver);
 }
 

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx
index 8f89751167fe59d60bce729fa7d63c285792ddc1..0bb71eb4f9152f3ef69fb9d04e5dfcc41a07e349 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -42,6 +42,7 @@
 #include "SALOMEDSImpl_AttributeParameter.hxx"
 #include "SALOMEDSImpl_ChildIterator.hxx"
 #include "SALOMEDSImpl_IParameters.hxx"
+#include "SALOMEDSImpl_Callback.hxx"
 
 #include "DF_Label.hxx"
 #include "DF_Attribute.hxx"
@@ -55,6 +56,81 @@
 #include <unistd.h>
 #endif
 
+class Notifier: public SALOMEDSImpl_AbstractCallback
+{
+public:
+//============================================================================
+/*! Function : addSO_Notification
+ *  Purpose  : This function tells all the observers that a SO has been added
+ */
+//============================================================================
+
+  virtual bool addSO_Notification(const SALOMEDSImpl_SObject& theSObject)
+    {
+      //MESSAGE("Notification ADD called")
+      CORBA::String_var event="ADD";
+      CORBA::String_var anID=theSObject.GetID().c_str();
+      for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
+        {
+          (*it)->notifyObserver(anID,event);
+        }
+      return true; // NGE return always true but can be modified if needed
+    }
+
+//============================================================================
+/*! Function : removeSO_Notification
+ *  Purpose  : This function tells all the observers that a SO has been removed
+ */
+//============================================================================
+
+  virtual bool removeSO_Notification(const SALOMEDSImpl_SObject& theSObject)
+    {
+      //MESSAGE("Notification REMOVE called")
+      CORBA::String_var event="REMOVE";
+      CORBA::String_var anID=theSObject.GetID().c_str();
+      for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
+        {
+          (*it)->notifyObserver(anID,event);
+        }
+      return true; // NGE return always true but can be modified if needed
+    }
+
+//============================================================================
+/*! Function : modifySO_Notification
+ *  Purpose  : This function tells all the observers that a SO has been modified
+ */
+//============================================================================
+
+  virtual bool modifySO_Notification(const SALOMEDSImpl_SObject& theSObject)
+    {
+      //MESSAGE("Notification MODIFY called")
+      CORBA::String_var event="MODIFY";
+      CORBA::String_var anID=theSObject.GetID().c_str();
+      for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
+        {
+          (*it)->notifyObserver(anID,event);
+        }
+      return true; // NGE return always true but can be modified if needed
+    }
+
+//============================================================================
+/*! Function : attach
+ *  Purpose  : register an Observer
+ */
+//============================================================================
+
+  virtual void attach(SALOME::Observer_ptr theObs)
+    {
+      myObservers.push_back(SALOME::Observer::_duplicate(theObs));
+    }
+
+private:
+    typedef std::list<SALOME::Observer_var> ObsList;
+    typedef ObsList::iterator ObsListIter;
+    ObsList myObservers;
+};
+
+
 std::map<SALOMEDSImpl_Study* , SALOMEDS_Study_i*> SALOMEDS_Study_i::_mapOfStudies;
 
 //============================================================================
@@ -67,6 +143,8 @@ SALOMEDS_Study_i::SALOMEDS_Study_i(SALOMEDSImpl_Study* theImpl,
 {
   _orb = CORBA::ORB::_duplicate(orb);
   _impl = theImpl;
+  _notifier = new Notifier;
+  theImpl->setNotifier(_notifier);
 
   _builder = new SALOMEDS_StudyBuilder_i(_impl->NewBuilder(), _orb);  
 }
@@ -1154,9 +1232,9 @@ void SALOMEDS_Study_i::EnableUseCaseAutoFilling(CORBA::Boolean isEnabled)
  *  Purpose  : This function attach an observer to the study
  */
 //============================================================================
-void SALOMEDS_Study_i::attach(SALOME::Observer_ptr theObs){
-       SALOMEDS::Locker lock;
-  _impl->attach(theObs);
+void SALOMEDS_Study_i::attach(SALOME::Observer_ptr theObs)
+{
+  _notifier->attach(theObs);
 }
 
 //===========================================================================

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx
index 9daf7f15ee6926b615936c2e631b202582fc994d..b2df91f8725fae9ae4768d59345a228a4bf58b41 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx
@@ -47,6 +47,8 @@
 #include "SALOMEDSImpl_Study.hxx"
 #include "SALOMEDSImpl_AttributeIOR.hxx"
 
+class Notifier;
+
 class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study
 {
 private:
@@ -54,9 +56,7 @@ private:
   SALOMEDSImpl_Study*            _impl;  
   SALOMEDS_StudyBuilder_i*       _builder;    
   static std::map<SALOMEDSImpl_Study*, SALOMEDS_Study_i*> _mapOfStudies;
-  typedef std::list<SALOME::Observer_var> ObsList;
-  typedef ObsList::iterator ObsListIter;
-  ObsList myObservers;
+  Notifier*                      _notifier;
 
 public:
 

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Callback.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Callback.hxx
index 91cef20ef066459ae59e9c237887a64db91672da..906403c97928ddad955eaaf31f33fd0e7ccd54d1 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Callback.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Callback.hxx
@@ -54,4 +54,11 @@ public:
 
 };
 
+class SALOMEDSIMPL_EXPORT SALOMEDSImpl_AbstractCallback
+{
+public:
+  virtual bool addSO_Notification(const SALOMEDSImpl_SObject& theSObject){return false;};
+  virtual bool removeSO_Notification(const SALOMEDSImpl_SObject& theSObject){return false;};
+  virtual bool modifySO_Notification(const SALOMEDSImpl_SObject& theSObject){return false;};
+};
 #endif

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index c8abc7e5ac536eb864c416ad79877b9a5a0deb4a..3e18369b16169095e091de8fc71538eeec311d03 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
@@ -45,8 +45,6 @@
 #include <fstream>
 #include <sstream>
 
-#include "utilities.h"
-
 #define DIRECTORYID       16661
 #define FILELOCALID       26662
 #define FILEID            "FILE: "
@@ -1991,15 +1989,9 @@ std::vector<std::string> SALOMEDSImpl_Study::GetIORs()
  *  Purpose  : This function tells all the observers that a SO has been added
  */
 //============================================================================
-bool SALOMEDSImpl_Study::addSO_Notification (const SALOMEDSImpl_SObject& theSObject) {
-  MESSAGE("Notification ADD called")
-  CORBA::String_var event="ADD";
-  CORBA::String_var anID=theSObject.GetID().c_str();
-  for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
-    {
-      (*it)->notifyObserver(anID,event);
-    }
-  return true; // NGE return always true but can be modified if needed
+bool SALOMEDSImpl_Study::addSO_Notification (const SALOMEDSImpl_SObject& theSObject)
+{
+  return _notifier->addSO_Notification(theSObject);
 }
 
 //============================================================================
@@ -2007,15 +1999,9 @@ bool SALOMEDSImpl_Study::addSO_Notification (const SALOMEDSImpl_SObject& theSObj
  *  Purpose  : This function tells all the observers that a SO has been removed
  */
 //============================================================================
-bool SALOMEDSImpl_Study::removeSO_Notification (const SALOMEDSImpl_SObject& theSObject) {
-  MESSAGE("Notification REMOVE called")
-  CORBA::String_var event="REMOVE";
-  CORBA::String_var anID=theSObject.GetID().c_str();
-  for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
-    {
-      (*it)->notifyObserver(anID,event);
-    }
-  return true; // NGE return always true but can be modified if needed
+bool SALOMEDSImpl_Study::removeSO_Notification (const SALOMEDSImpl_SObject& theSObject)
+{
+  return _notifier->removeSO_Notification(theSObject);
 }
 
 //============================================================================
@@ -2023,23 +2009,17 @@ bool SALOMEDSImpl_Study::removeSO_Notification (const SALOMEDSImpl_SObject& theS
  *  Purpose  : This function tells all the observers that a SO has been modified
  */
 //============================================================================
-bool SALOMEDSImpl_Study::modifySO_Notification (const SALOMEDSImpl_SObject& theSObject) {
-  MESSAGE("Notification MODIFY called")
-  CORBA::String_var event="MODIFY";
-  CORBA::String_var anID=theSObject.GetID().c_str();
-  for (ObsListIter it (myObservers.begin()); it != myObservers.end(); ++it)
-    {
-      (*it)->notifyObserver(anID,event);
-    }
-  return true; // NGE return always true but can be modified if needed
+bool SALOMEDSImpl_Study::modifySO_Notification (const SALOMEDSImpl_SObject& theSObject) 
+{
+  return _notifier->modifySO_Notification(theSObject);
 }
 
 //============================================================================
-/*! Function : attach
- *  Purpose  : register an Observer
+/*! Function : setNotifier
+ *  Purpose  : register a notifier
  */
 //============================================================================
-void SALOMEDSImpl_Study::attach(SALOME::Observer_ptr theObs) 
+void SALOMEDSImpl_Study::setNotifier(SALOMEDSImpl_AbstractCallback* notifier) 
 {
-   myObservers.push_back(SALOME::Observer::_duplicate(theObs));
+  _notifier=notifier;
 }

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
index a4f6b0910eb63e4ff76953119d21cd4de69c6e89..0731d3ab3de08c4bfc7f7e55077415b376214942 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
@@ -32,7 +32,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <list>
 
 #include "DF_Document.hxx"
 #include "DF_Label.hxx"
@@ -51,7 +50,6 @@
 #include "SALOMEDSImpl_Driver.hxx" 
 #include "SALOMEDSImpl_ChildIterator.hxx" 
 #include "SALOMEDSImpl_GenericVariable.hxx"
-#include "SALOME_Observer.hh"
 
 class SALOMEDSImpl_StudyManager;
 class SALOMEDSImpl_GenericAttribute;
@@ -72,16 +70,13 @@ private:
   SALOMEDSImpl_Callback*   _cb;
   SALOMEDSImpl_StudyBuilder*   _builder;
   SALOMEDSImpl_UseCaseBuilder* _useCaseBuilder;
+  SALOMEDSImpl_AbstractCallback*   _notifier;
 
   std::map<std::string, SALOMEDSImpl_SObject> _mapOfSO;
   std::map<std::string, SALOMEDSImpl_SComponent> _mapOfSCO;
   std::map<std::string, DF_Label> myIORLabels;
   std::vector<SALOMEDSImpl_GenericVariable*> myNoteBookVars;
 
-  typedef std::list<SALOME::Observer_var> ObsList;
-  typedef ObsList::iterator ObsListIter;
-  ObsList myObservers;
-
   SALOMEDSImpl_SObject   _FindObject(const SALOMEDSImpl_SObject& SO,
     const std::string& anObjectName,
     bool& _find);
@@ -323,7 +318,7 @@ public:
   virtual bool addSO_Notification(const SALOMEDSImpl_SObject& theSObject);
   virtual bool removeSO_Notification(const SALOMEDSImpl_SObject& theSObject);
   virtual bool modifySO_Notification(const SALOMEDSImpl_SObject& theSObject);
-  virtual void attach(SALOME::Observer_ptr theObs);
+  virtual void setNotifier(SALOMEDSImpl_AbstractCallback* notifier);
 
 
   friend class SALOMEDSImpl_StudyManager;    

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
index 804d5e3074bf07db6b955613ae7b9981484e5340..f49c7d0c686b176aa08e1123cee486d54ee649b8 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
@@ -74,7 +74,7 @@ SALOMEDSImpl_StudyBuilder::~SALOMEDSImpl_StudyBuilder()
 //============================================================================
 SALOMEDSImpl_SComponent SALOMEDSImpl_StudyBuilder::NewComponent(const std::string& DataType)
 {
-  std::cerr << "I'm here newComponent " << std::endl;
+  //std::cerr << "I'm here newComponent " << std::endl;
   _errorCode = "";
   CheckLocked();
   
@@ -139,7 +139,6 @@ bool SALOMEDSImpl_StudyBuilder::RemoveComponent(const SALOMEDSImpl_SComponent& a
 //============================================================================
 SALOMEDSImpl_SObject SALOMEDSImpl_StudyBuilder::NewObject(const SALOMEDSImpl_SObject& theFatherObject)
 {
-  std::cerr << "I'm here newObject " << std::endl;
   _errorCode = "";
   CheckLocked();
 
@@ -575,7 +574,6 @@ bool SALOMEDSImpl_StudyBuilder::Addreference(const SALOMEDSImpl_SObject& me,
   SALOMEDSImpl_AttributeTarget::Set(RefLab)->Add(SALOMEDSImpl_Study::SObject(Lab));
 
   if(_callbackOnRemove && Lab.IsDescendant(_doc->Main())) _callbackOnRemove->OnRemoveSObject(me);
-  _study->removeSO_Notification(me);
   
   return true;
 }