Merge multi-study removal branch.

diff --cc src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
index 341a7428f940b562a93dec6c509cdce4ed5a1067,15fa3dced31b0251347b0754c7c3a1e4490a0737..784e8334cf86273576543c2ebe5cb1c6638fc6e5
--- 1/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
@@@ -41,11 -41,10 +41,9 @@@ NETGENPlugin_Hypothesis_2D_ONLY_i (Port
                                     ::SMESH_Gen*            theGenImpl)
    : SALOME::GenericObj_i( thePOA ),
      SMESH_Hypothesis_i( thePOA ),
-     NETGENPlugin_Hypothesis_2D_i( thePOA, theStudyId, theGenImpl )
+     NETGENPlugin_Hypothesis_2D_i( thePOA, theGenImpl )
  {
 -  MESSAGE( "NETGENPlugin_Hypothesis_2D_ONLY_i::NETGENPlugin_Hypothesis_2D_ONLY_i" );
    myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
-                                                  theStudyId,
                                                   theGenImpl);
  }
  

diff --cc src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
index ebab3bdee61aa5c57c52e0380d6523db243e53a0,0fe377a935e50a99945224e918c17f6496a9e71c..8523ff33ec1fbb204c15aa7a0ad45239faa0a6fc
--- 1/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
@@@ -43,10 -43,9 +43,9 @@@ NETGENPlugin_Hypothesis_3D_i (PortableS
                                ::SMESH_Gen*            theGenImpl)
    : SALOME::GenericObj_i( thePOA ),
      SMESH_Hypothesis_i( thePOA ),
-     NETGENPlugin_Hypothesis_i( thePOA, theStudyId, theGenImpl )
+     NETGENPlugin_Hypothesis_i( thePOA, theGenImpl )
  {
 -  MESSAGE( "NETGENPlugin_Hypothesis_3D_i::NETGENPlugin_Hypothesis_3D_i" );
 +  //MESSAGE( "NETGENPlugin_Hypothesis_3D_i::NETGENPlugin_Hypothesis_3D_i" );
  }
  
  //=============================================================================

diff --cc src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index dc3afe7fc78b43c7706f1e9eed59e46b2be98307,01f9c8cca04c3e5caaaeb63cb721d5cfa89712de..73e8c6d89387e14aa11aab0cc125c5ecad149264
--- 1/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@@ -3616,9 -3477,9 +3611,9 @@@ void NETGENPlugin_Mesher::toPython( con
    ofstream outfile( pyFile, ios::out );
    if ( !outfile ) return;
  
 -  outfile << "import SMESH" << endl
 +  outfile << "import salome, SMESH" << endl
            << "from salome.smesh import smeshBuilder" << endl
-           << "smesh = smeshBuilder.New(salome.myStudy)" << endl
+           << "smesh = smeshBuilder.New()" << endl
            << "mesh = smesh.Mesh()" << endl << endl;
  
    using namespace netgen;

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
index 3b5c529fd90157d3da44c4c9f35aded6529b667c,4797cc7314bf62057db83769bd561b2ece5fdd4f..99f5994b8b6b285cd3bb65202042b23b8cb2a25b
--- 1/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
@@@ -55,11 -53,11 +55,11 @@@ using namespace std
   */
  //=============================================================================
  
- NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId, int studyId,
+ NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId,
                                                     SMESH_Gen* gen)
-   : SMESH_3D_Algo(hypId, studyId, gen)
+   : SMESH_3D_Algo(hypId, gen)
  {
 -  MESSAGE("NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D");
 +  //MESSAGE("NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D");
    _name = "NETGEN_2D3D";
    _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type
    _compatibleHypothesis.push_back("NETGEN_Parameters");

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
index 0728470ad5f65fb0b2e071aee9cd5e3defceed6d,e95e3b76fedc3f838f90a830103ac4f57ace7a44..1f7e36add2e0e59c1c315b78667f8d1794f453ec
--- 1/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
--- 2/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
@@@ -40,14 -39,14 +40,14 @@@ class StdMeshers_ViscousLayers
  class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D3D: public SMESH_3D_Algo
  {
  public:
-   NETGENPlugin_NETGEN_2D3D(int hypId, int studyId, SMESH_Gen* gen);
+   NETGENPlugin_NETGEN_2D3D(int hypId, SMESH_Gen* gen);
    virtual ~NETGENPlugin_NETGEN_2D3D();
  
 -  virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
 +  virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,
                                 const TopoDS_Shape& aShape,
 -                               SMESH_Hypothesis::Hypothesis_Status& aStatus);
 +                               Hypothesis_Status&  aStatus);
  
 -  virtual bool Compute(SMESH_Mesh& aMesh,
 +  virtual bool Compute(SMESH_Mesh&         aMesh,
                         const TopoDS_Shape& aShape);
  
    virtual void CancelCompute();

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
index ded96a974971e80ada7a35f230feb45a955b41a6,e74baa1e0db16f1a45492d54ab10a745b6f7eace..d3bb788c19c78994307c1093be156ff29759608b
--- 1/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
@@@ -50,9 -49,8 +49,8 @@@ NETGENPlugin_NETGEN_2D3D_i::NETGENPlugi
         SMESH_Algo_i( thePOA ),
         SMESH_3D_Algo_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
 +  //MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
    myBaseImpl = new ::NETGENPlugin_NETGEN_2D3D( theGenImpl->GetANewId(),
-                                                theStudyId,
                                                 theGenImpl );
  }
  

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
Simple merge

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
index f5d83d3f7a2df7d29fb29ffa3170d81f4701cd49,e0c5481123b432a9fd4f3c888bfd6315b839f51c..0fec081e340ebb7101344f1fa9e3694dbd9ea8f5
--- 1/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
@@@ -43,8 -42,8 +42,7 @@@ NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPl
         SMESH_Algo_i( thePOA ),
         SMESH_2D_Algo_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i" );
    myBaseImpl = new ::NETGENPlugin_NETGEN_2D_ONLY( theGenImpl->GetANewId(),
-                                                   theStudyId,
                                                    theGenImpl );
  }
  

diff --cc src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
Simple merge

diff --cc src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
index dab006aafe61e24008ec7f5edd48808515abe0fb,ba2f4b8bb0358e73a824e364a0748562d7d1448b..e434f847844d2868b84f0e68f762df0f769b3675
--- 1/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
@@@ -50,9 -49,8 +49,8 @@@ NETGENPlugin_SimpleHypothesis_2D_i (Por
    : SALOME::GenericObj_i( thePOA ),
      SMESH_Hypothesis_i( thePOA )
  {
 -  MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
 +  //MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
    myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_2D (theGenImpl->GetANewId(),
-                                                        theStudyId,
                                                         theGenImpl);
  }
  

diff --cc src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
index ec5b2168996664db8727857cf72a84337499c0de,05dc66b850035d15d65c733aa0fc10e1c817c414..f851b530d1f4078442d1026e13a201a396af520a
--- 1/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
--- 2/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
@@@ -46,10 -46,9 +46,9 @@@ NETGENPlugin_SimpleHypothesis_3D_i (Por
                                      ::SMESH_Gen*            theGenImpl)
    : SALOME::GenericObj_i( thePOA ),
      SMESH_Hypothesis_i( thePOA ),
-     NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theStudyId,theGenImpl )
+     NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theGenImpl )
  {
 -  MESSAGE( "NETGENPlugin_SimpleHypothesis_3D_i::NETGENPlugin_SimpleHypothesis_3D_i" );
 +  //MESSAGE( "NETGENPlugin_SimpleHypothesis_3D_i::NETGENPlugin_SimpleHypothesis_3D_i" );
    if ( myBaseImpl )
      delete myBaseImpl;
    myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_3D (theGenImpl->GetANewId(),