X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParallelContainer%2FSALOME_ParallelContainer_i.hxx;h=52d232dce8f70ef35b9156f1297d00a3e74b0dc0;hb=dc4b16b9dd53dd42139fd22ef26556861db58989;hp=2e445b9bcff1cacb62a92c77101948cf00096259;hpb=85c1fbcc9f52fc41cab4cb81f4a9f10fd410a368;p=modules%2Fkernel.git

diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
index 2e445b9bc..52d232dce 100644
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : SALOME_ParallelContainer_i.hxx
-//  Author : André RIBES, EDF
+//  Author : Andr� RIBES, EDF
 
 #ifndef _SALOME_PARALLEL_CONTAINER_I_HXX_
 #define _SALOME_PARALLEL_CONTAINER_I_HXX_
@@ -73,12 +73,10 @@ public:
   virtual bool load_component_Library(const char* componentName, CORBA::String_out reason);
 
   virtual Engines::EngineComponent_ptr
-  create_component_instance( const char* componentName,
-                             CORBA::Long studyId); // 0 for multiStudy
+  create_component_instance( const char* componentName);
 
   virtual Engines::EngineComponent_ptr
   create_component_instance_env( const char* componentName,
-                                 CORBA::Long studyId,          // 0 for multiStudy
                                  const Engines::FieldsDict& env,
                                  CORBA::String_out reason);
 
@@ -87,8 +85,7 @@ public:
                                  CORBA::String_out reason);
 
   Engines::EngineComponent_ptr
-  find_component_instance( const char* registeredName,
-                           CORBA::Long studyId); // 0 for multiStudy
+  find_component_instance( const char* registeredName);
 
   Engines::EngineComponent_ptr
   load_impl(const char* nameToRegister,
@@ -96,8 +93,7 @@ public:
 
   void
   create_paco_component_node_instance(const char* componentName,
-                                      const char* proxy_containerName,
-                                      CORBA::Long studyId); // 0 for multiStudy
+                                      const char* proxy_containerName);
 
   void updateInstanceNumber();
 
@@ -123,12 +119,10 @@ public:
 
   Engines::EngineComponent_ptr
   createCPPInstance(std::string genericRegisterName,
-                    void *handle,
-                    int studyId);
+                    void *handle);
 
   Engines::EngineComponent_ptr
-  createPythonInstance(std::string genericRegisterName,
-                       int studyId);
+  createPythonInstance(std::string genericRegisterName);
 
   static bool isPythonContainer(const char* ContainerName);
   static void decInstanceCnt(std::string genericRegisterName);
@@ -142,9 +136,9 @@ public:
   virtual Engines::Salome_file_ptr createSalome_file(const char* origFileName);
   void copyFile(Engines::Container_ptr container, const char* remoteFile, const char* localFile);
   Engines::PyNode_ptr createPyNode(const char* nodeName, const char* code);
-  Engines::PyNode_ptr getDefaultPyNode();
+  Engines::PyNode_ptr getDefaultPyNode(const char *nodeName);
   Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code);
-  Engines::PyScriptNode_ptr getDefaultPyScriptNode();
+  Engines::PyScriptNode_ptr getDefaultPyScriptNode(const char *nodeName);
 protected:
 
   SALOME_NamingService *_NS;
@@ -167,8 +161,8 @@ protected:
   _fileRef_map_t _fileRef_map;
   _Salome_file_map_t _Salome_file_map;
 
-  // Cette map contient les references vers les différentes
-  // instances d'objets parallèles.
+  // Cette map contient les references vers les diff�rentes
+  // instances d'objets parall�les.
   std::map<std::string, PortableServer::ObjectId *> _par_obj_inst_map;
 
   typedef  PortableServer::ObjectId * (*FACTORY_FUNCTION) (CORBA::ORB_ptr, char *, int,