0023299: [CEA] Finalize multi-study removal

[modules/kernel.git] / src / Container / Component_i.cxx

diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx
index 8a84c67d14f95a59ad0f30b83fef99af8c111d3a..7857a5d1034f5fc0c196f913e5eb7a11deaf79b7 100644 (file)
--- a/src/Container/Component_i.cxx
+++ b/src/Container/Component_i.cxx
@@ -51,7 +51,7 @@ int SIGUSR11 = 1000;
 extern bool _Sleeping ;
 static Engines_Component_i * theEngines_Component ;
 
-bool Engines_Component_i::_isMultiStudy = true;
+bool Engines_Component_i::_isMultiStudy = false;
 bool Engines_Component_i::_isMultiInstance = false;
 
 /*! \class Engines_Component_i
@@ -101,7 +101,6 @@ Engines_Component_i::Engines_Component_i(CORBA::ORB_ptr orb,
   _Executed(false) ,
   _graphName("") ,
   _nodeName(""),
-  _studyId(-1),
   _id(0),
   _contId(0),
   _CanceledThread(false)
@@ -155,7 +154,6 @@ Engines_Component_i::Engines_Component_i(CORBA::ORB_ptr orb,
   _Executed(false) ,
   _graphName("") ,
   _nodeName(""),
-  _studyId(-1),
   _id(0),
   _contId(0),
   _CanceledThread(false)
@@ -227,20 +225,6 @@ char* Engines_Component_i::interfaceName()
   return CORBA::string_dup(_interfaceName.c_str()) ;
 }
 
-//=============================================================================
-/*!
- *  CORBA method: Get study Id
- *  \return -1: not initialised (Internal Error)
- *           0: multistudy component instance
- *          >0: study id associated to this instance
- */
-//=============================================================================
-
-CORBA::Long Engines_Component_i::getStudyId()
-{
-  return _studyId;
-}
-
 //=============================================================================
 /*!
  *  CORBA method: Test if instance is alive and responds
@@ -606,31 +590,6 @@ Engines_Container_i *Engines_Component_i::GetContainerPtr()
   return dynamic_cast<Engines_Container_i*>(_poa->id_to_servant(contId)) ;
 }
 
-//=============================================================================
-/*!
- *  C++ method: set study Id
- *  \param studyId         0 if instance is not associated to a study,
- *                         >0 otherwise (== study id)
- *  \return true if the set of study Id is OK
- *  must be set once by Container, at instance creation,
- *  and cannot be changed after.
- */
-//=============================================================================
-
-CORBA::Boolean Engines_Component_i::setStudyId(CORBA::Long studyId)
-{
-  ASSERT( studyId >= 0);
-  CORBA::Boolean ret = false;
-  if (_studyId < 0) // --- not yet initialized
-    {
-      _studyId = studyId;
-      ret = true;
-    }
-  else
-    if ( _studyId == studyId) ret = true;
-  return ret;
-}
-
 //=============================================================================
 /*!
  *  C++ method: return CORBA instance id, the id is set in derived class