From c8801f4c49a0dd5a4832af085828bb23a1e39eb9 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 4 Mar 2011 15:00:41 +0000
Subject: [PATCH] 1. SALOME::GenericObj : Destroy() -> UnRegister() 2.
 Introduce interfaces ExportableObject and ImportableComponent interfaces 3.
 Inherit fileTransfer from SALOME::GenericObj

---
 src/Container/Makefile.am                       | 4 +++-
 src/Container/SALOME_FileTransfer_i.hxx         | 5 ++++-
 src/Container/SALOME_PyNode.py                  | 2 +-
 src/DSC/DSC_Basic/Makefile.am                   | 1 +
 src/DSC/DSC_Python/Makefile.am                  | 1 +
 src/DSC/DSC_User/Basic/Makefile.am              | 1 +
 src/DSC/DSC_User/Datastream/Calcium/Makefile.am | 1 +
 src/DSC/DSC_User/Datastream/Palm/Makefile.am    | 1 +
 src/DSC/DSC_User/Makefile.am                    | 1 +
 src/GenericObj/SALOME_GenericObj_i.cc           | 4 ++--
 src/GenericObj/SALOME_GenericObj_i.hh           | 2 +-
 src/KERNEL_PY/salome_genericobj.py              | 2 +-
 src/LifeCycleCORBA/Makefile.am                  | 2 ++
 src/MPIContainer/Makefile.am                    | 2 ++
 src/SALOMEDS/SALOMEDS_ChildIterator.cxx         | 2 +-
 src/SALOMEDS/SALOMEDS_Driver_i.cxx              | 2 +-
 src/SALOMEDS/SALOMEDS_GenericAttribute.cxx      | 2 +-
 src/SALOMEDS/SALOMEDS_SComponentIterator.cxx    | 2 +-
 src/SALOMEDS/SALOMEDS_SObject.cxx               | 2 +-
 src/SALOMEDS/SALOMEDS_Study_i.cxx               | 8 ++++----
 src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx        | 2 +-
 src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx       | 2 +-
 src/TestContainer/Makefile.am                   | 2 ++
 src/TestMPIContainer/Makefile.am                | 2 ++
 24 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index fdffc037c..349274422 100644
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -47,7 +47,7 @@ salomeinclude_HEADERS = \
 # Scripts to be installed
 dist_salomescript_PYTHON =\
 	SALOME_ComponentPy.py \
-  SALOME_PyNode.py \
+	SALOME_PyNode.py \
 	SALOME_Container.py
 
 # These files are executable scripts
@@ -72,6 +72,7 @@ COMMON_CPPFLAGS=\
 	-I$(srcdir)/../Notification \
 	-I$(srcdir)/../ResourcesManager \
 	-I$(srcdir)/../HDFPersist \
+	-I$(srcdir)/../GenericObj \
 	-I$(top_builddir)/idl \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 
@@ -86,6 +87,7 @@ COMMON_LIBS =\
 	../SALOMELocalTrace/libSALOMELocalTrace.la \
 	../Basics/libSALOMEBasics.la \
 	../HDFPersist/libSalomeHDFPersist.la \
+	../GenericObj/libSalomeGenericObj.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la \
 	@CORBA_LIBS@ \
 	$(PYTHON_LIBS)
diff --git a/src/Container/SALOME_FileTransfer_i.hxx b/src/Container/SALOME_FileTransfer_i.hxx
index 8b599f663..624b75243 100644
--- a/src/Container/SALOME_FileTransfer_i.hxx
+++ b/src/Container/SALOME_FileTransfer_i.hxx
@@ -30,6 +30,8 @@
 
 #include "SALOME_Container.hxx"
 
+#include "SALOME_GenericObj_i.hh"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include <map>
@@ -37,7 +39,8 @@
 
 class CONTAINER_EXPORT fileTransfer_i:
   public virtual POA_Engines::fileTransfer,
-  public virtual PortableServer::ServantBase
+  public virtual PortableServer::ServantBase,
+  public virtual SALOME::GenericObj_i
 {
 public:
   fileTransfer_i();
diff --git a/src/Container/SALOME_PyNode.py b/src/Container/SALOME_PyNode.py
index d0f8f5273..d501223df 100644
--- a/src/Container/SALOME_PyNode.py
+++ b/src/Container/SALOME_PyNode.py
@@ -40,7 +40,7 @@ class Generic(SALOME__POA.GenericObj):
   def Register(self):
     self.cnt+=1
 
-  def Destroy(self):
+  def UnRegister(self):
     self.cnt-=1
     if self.cnt <= 0:
       oid=self.poa.servant_to_id(self)
diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am
index c584eff3c..789063e65 100644
--- a/src/DSC/DSC_Basic/Makefile.am
+++ b/src/DSC/DSC_Basic/Makefile.am
@@ -46,6 +46,7 @@ salomeinclude_HEADERS = ConnectionManager_i.hxx \
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_srcdir)/src/SALOMELocalTrace \
 		 -I$(top_srcdir)/src/Basics \
diff --git a/src/DSC/DSC_Python/Makefile.am b/src/DSC/DSC_Python/Makefile.am
index fc96419a9..068b35699 100644
--- a/src/DSC/DSC_Python/Makefile.am
+++ b/src/DSC/DSC_Python/Makefile.am
@@ -42,6 +42,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \
 		 -I$(top_srcdir)/src/Basics \
 		 -I$(top_srcdir)/src/Utils \
 		 -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_builddir)/idl \
 		 @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @BOOST_CPPFLAGS@
diff --git a/src/DSC/DSC_User/Basic/Makefile.am b/src/DSC/DSC_User/Basic/Makefile.am
index def7af510..c6c5534cf 100644
--- a/src/DSC/DSC_User/Basic/Makefile.am
+++ b/src/DSC/DSC_User/Basic/Makefile.am
@@ -47,6 +47,7 @@ COMMON_CPPFLAGS= -I$(top_builddir)/idl \
 		 -I$(top_srcdir)/src/DSC/DSC_Basic \
 		 -I$(top_srcdir)/src/DSC/DSC_User \
 		 -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_srcdir)/src/SALOMELocalTrace \
 		 -I$(top_srcdir)/src/Basics \
diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
index ffcbce1df..0760bb29a 100644
--- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
@@ -89,6 +89,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \
 		 -I$(top_srcdir)/src/Basics \
 		 -I$(top_srcdir)/src/Utils \
 		 -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_builddir)/idl \
 		 -I$(top_builddir)/src/DSC/DSC_User/Datastream/Calcium \
diff --git a/src/DSC/DSC_User/Datastream/Palm/Makefile.am b/src/DSC/DSC_User/Datastream/Palm/Makefile.am
index 0ab71953e..f74cd82a8 100644
--- a/src/DSC/DSC_User/Datastream/Palm/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Palm/Makefile.am
@@ -48,6 +48,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \
 		 -I$(top_srcdir)/src/DSC/DSC_User/Datastream \
 		 -I$(top_srcdir)/src/DSC/DSC_Basic \
 		 -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_srcdir)/src/SALOMELocalTrace \
 		 -I$(top_srcdir)/src/Basics \
diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am
index b31e6b3fc..7c4193338 100644
--- a/src/DSC/DSC_User/Makefile.am
+++ b/src/DSC/DSC_User/Makefile.am
@@ -48,6 +48,7 @@ salomeinclude_HEADERS = base_port.hxx \
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS= \
 		 -I$(top_srcdir)/src/Container \
+		 -I$(top_srcdir)/src/GenericObj \
 		 -I$(top_srcdir)/src/Notification \
 		 -I$(top_srcdir)/src/DSC/DSC_Basic \
 		 -I$(top_srcdir)/src/SALOMELocalTrace \
diff --git a/src/GenericObj/SALOME_GenericObj_i.cc b/src/GenericObj/SALOME_GenericObj_i.cc
index 1e41fbcb0..0f0ad93ba 100644
--- a/src/GenericObj/SALOME_GenericObj_i.cc
+++ b/src/GenericObj/SALOME_GenericObj_i.cc
@@ -63,9 +63,9 @@ void GenericObj_i::Register(){
 }
 
 
-void GenericObj_i::Destroy(){
+void GenericObj_i::UnRegister(){
   if(MYDEBUG)
-    MESSAGE("GenericObj_i::Destroy "<<this<<"; myRefCounter = "<<myRefCounter)
+    MESSAGE("GenericObj_i::UnRegister "<<this<<"; myRefCounter = "<<myRefCounter)
   if(--myRefCounter <= 0){
     PortableServer::ObjectId_var anObjectId = myPOA->servant_to_id(this);
     myPOA->deactivate_object(anObjectId.in());
diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh
index d1b1994bc..6d7657726 100644
--- a/src/GenericObj/SALOME_GenericObj_i.hh
+++ b/src/GenericObj/SALOME_GenericObj_i.hh
@@ -64,7 +64,7 @@ namespace SALOME{
     /*! Increase the reference count (mark as used by another object).*/
     virtual void Register();
     /*! Decrease the reference count (release by another object).*/
-    virtual void Destroy();
+    virtual void UnRegister();
   };
 };
 
diff --git a/src/KERNEL_PY/salome_genericobj.py b/src/KERNEL_PY/salome_genericobj.py
index 4acdc43f0..d307ed1a0 100644
--- a/src/KERNEL_PY/salome_genericobj.py
+++ b/src/KERNEL_PY/salome_genericobj.py
@@ -31,7 +31,7 @@ import omniORB
 import SALOME
 
 def mydel(self):
-    self.Destroy()
+    self.UnRegister()
     omniORB.CORBA.Object.__del__(self)
 
 def mysetattr(self,attr,value):
diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am
index c72a6b4a6..5bfd5b126 100644
--- a/src/LifeCycleCORBA/Makefile.am
+++ b/src/LifeCycleCORBA/Makefile.am
@@ -55,6 +55,7 @@ COMMON_CPPFLAGS=\
 	-I$(srcdir)/../SALOMETraceCollector \
 	-I$(srcdir)/../NamingService \
 	-I$(srcdir)/../Utils \
+	-I$(srcdir)/../GenericObj \
 	-I$(srcdir)/../Container \
 	-I$(srcdir)/../ResourcesManager \
 	-I$(top_builddir)/idl \
@@ -68,6 +69,7 @@ COMMON_LIBS =\
 	../Utils/libOpUtil.la \
 	../SALOMELocalTrace/libSALOMELocalTrace.la \
 	../Basics/libSALOMEBasics.la \
+	../GenericObj/libSalomeGenericObj.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la
 
 #
diff --git a/src/MPIContainer/Makefile.am b/src/MPIContainer/Makefile.am
index d8a35f1dc..50b8183cd 100644
--- a/src/MPIContainer/Makefile.am
+++ b/src/MPIContainer/Makefile.am
@@ -61,6 +61,7 @@ COMMON_CPPFLAGS=\
 	-I$(srcdir)/../Notification \
 	-I$(srcdir)/../ResourcesManager \
 	-I$(srcdir)/../Container \
+	-I$(srcdir)/../GenericObj \
 	-I$(top_builddir)/idl \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
@@ -74,6 +75,7 @@ COMMON_LIBS =\
 	../SALOMELocalTrace/libSALOMELocalTrace.la \
 	../Basics/libSALOMEBasics.la \
 	../Container/libSalomeContainer.la \
+	../GenericObj/libSalomeGenericObj.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la\
 	@CORBA_LIBS@
 
diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
index dd4a0a2bc..16d7892fc 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
@@ -45,7 +45,7 @@ SALOMEDS_ChildIterator::SALOMEDS_ChildIterator(SALOMEDS::ChildIterator_ptr theIt
 
 SALOMEDS_ChildIterator::~SALOMEDS_ChildIterator()
 {
-  if(!_isLocal) _corba_impl->Destroy(); 
+  if(!_isLocal) _corba_impl->UnRegister(); 
   else if(_local_impl) delete _local_impl;
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.cxx b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
index e4607be4b..7d845471c 100644
--- a/src/SALOMEDS/SALOMEDS_Driver_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
@@ -158,7 +158,7 @@ bool SALOMEDS_Driver_i::CanCopy(const SALOMEDSImpl_SObject& theObject)
 
   SALOMEDS::unlock();
   bool isOk = _driver->CanCopy(so.in());
-  so->Destroy();
+  so->UnRegister();
   SALOMEDS::lock();
 
   return isOk;
diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
index 2f9ad0777..f209f0242 100644
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
@@ -70,7 +70,7 @@ SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDS::GenericAttribute_
 SALOMEDS_GenericAttribute::~SALOMEDS_GenericAttribute() 
 {
   if (!_isLocal) {
-    _corba_impl->Destroy();
+    _corba_impl->UnRegister();
   }
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator.cxx b/src/SALOMEDS/SALOMEDS_SComponentIterator.cxx
index 2598aa400..724ded4b2 100644
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator.cxx
@@ -45,7 +45,7 @@ SALOMEDS_SComponentIterator::SALOMEDS_SComponentIterator(SALOMEDS::SComponentIte
 
 SALOMEDS_SComponentIterator::~SALOMEDS_SComponentIterator()
 {
-  if(!_isLocal) _corba_impl->Destroy(); 
+  if(!_isLocal) _corba_impl->UnRegister(); 
   else if(_local_impl) delete _local_impl;
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_SObject.cxx b/src/SALOMEDS/SALOMEDS_SObject.cxx
index 1c87909fa..4d9a2a165 100644
--- a/src/SALOMEDS/SALOMEDS_SObject.cxx
+++ b/src/SALOMEDS/SALOMEDS_SObject.cxx
@@ -96,7 +96,7 @@ SALOMEDS_SObject::SALOMEDS_SObject(const SALOMEDSImpl_SObject& theSObject)
 SALOMEDS_SObject::~SALOMEDS_SObject()
 {
   if (!_isLocal) {
-    _corba_impl->Destroy();
+    _corba_impl->UnRegister();
   }
   else {
     if(_local_impl) delete _local_impl;
diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx
index 9bee45f32..4213401ae 100644
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -793,11 +793,11 @@ void SALOMEDS_Study_i::Close()
       catch (CORBA::Exception&) 
         {/*pass*/ }
     }
-    sco->Destroy();
+    sco->UnRegister();
   }
 
   //Does not need any more this iterator
-  itcomponent->Destroy();
+  itcomponent->UnRegister();
 
 
   _impl->Close();
@@ -842,8 +842,8 @@ void SALOMEDS_Study_i::RemovePostponed(CORBA::Long /*theUndoLimit*/)
       SALOME::GenericObj_var aGeneric = SALOME::GenericObj::_narrow(obj);
 	  //rnv: To avoid double deletion of the Salome Generic Objects:
 	  //rnv: 1. First decrement of the reference count in the SALOMEDSImpl_AttributeIOR::~SALOMEDSImpl_AttributeIOR();
-	  //rnv: 2. Second decrement of the reference count in the next string : aGeneric->Destroy();
-      //if (!CORBA::is_nil(aGeneric)) aGeneric->Destroy();
+	  //rnv: 2. Second decrement of the reference count in the next string : aGeneric->UnRegister();
+      //if (!CORBA::is_nil(aGeneric)) aGeneric->UnRegister();
     } catch (...) {}
   }
 
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
index e7ab7f695..f3fbb4c17 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
@@ -51,7 +51,7 @@ SALOMEDS_UseCaseBuilder::SALOMEDS_UseCaseBuilder(SALOMEDS::UseCaseBuilder_ptr th
 
 SALOMEDS_UseCaseBuilder::~SALOMEDS_UseCaseBuilder()
 {
-  if(!_isLocal) _corba_impl->Destroy(); 
+  if(!_isLocal) _corba_impl->UnRegister(); 
 }  
 
 bool SALOMEDS_UseCaseBuilder::Append(const _PTR(SObject)& theObject)
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
index c0db43674..a089cd8c7 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
@@ -44,7 +44,7 @@ SALOMEDS_UseCaseIterator::SALOMEDS_UseCaseIterator(SALOMEDS::UseCaseIterator_ptr
 
 SALOMEDS_UseCaseIterator::~SALOMEDS_UseCaseIterator()
 {
-  if(!_isLocal) _corba_impl->Destroy();    
+  if(!_isLocal) _corba_impl->UnRegister();    
   else if(_local_impl) delete _local_impl;
 }
 
diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index 5d2434d14..ce4e82d98 100644
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -55,6 +55,7 @@ COMMON_CPPFLAGS=\
 	-I$(srcdir)/../Registry \
 	-I$(srcdir)/../Notification \
 	-I$(srcdir)/../ResourcesManager \
+	-I$(srcdir)/../GenericObj \
 	-I$(srcdir)/../Container \
 	-I$(top_builddir)/idl \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
@@ -70,6 +71,7 @@ COMMON_LIBS =\
 	../Utils/libOpUtil.la \
 	../SALOMELocalTrace/libSALOMELocalTrace.la \
 	../Basics/libSALOMEBasics.la \
+	../GenericObj/libSalomeGenericObj.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la
 
 #
diff --git a/src/TestMPIContainer/Makefile.am b/src/TestMPIContainer/Makefile.am
index 1a6bd7e0d..efd8ab318 100644
--- a/src/TestMPIContainer/Makefile.am
+++ b/src/TestMPIContainer/Makefile.am
@@ -59,6 +59,7 @@ COMMON_CPPFLAGS=\
 	-I$(srcdir)/../ResourcesManager \
 	-I$(srcdir)/../Container \
 	-I$(srcdir)/../MPIContainer \
+	-I$(srcdir)/../GenericObj \
 	-I$(top_builddir)/idl \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
@@ -73,6 +74,7 @@ COMMON_LIBS =\
 	../Basics/libSALOMEBasics.la \
 	../Container/libSalomeContainer.la \
 	../MPIContainer/libSalomeMPIContainer.la \
+	../GenericObj/libSalomeGenericObj.la \
 	$(top_builddir)/idl/libSalomeIDLKernel.la\
 	@CORBA_LIBS@
 
-- 
2.39.2