- Change some operations prototypes

- Fix Parallel_Salome_file

diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl
index 5ecb18affbebf8d83c4effd67667584a1da7b3c7..08aea29fc669d1ac0c81e61979e7f0d4a2fd843d 100644 (file)
--- a/idl/SALOME_Component.idl
+++ b/idl/SALOME_Component.idl
@@ -300,8 +300,8 @@ module Engines
       \exception contains informations of what if the component cannot 
       sends the file's reference.
     */
-    Engines::Salome_file getInputServiceSalome_file(in string service_name, 
-                                                   in string Salome_file_name)  raises(SALOME::SALOME_Exception);
+    Engines::Salome_file getInputFileToService(in string service_name, 
+                                              in string Salome_file_name)       raises(SALOME::SALOME_Exception);
 
     /*!
       This method is used before the activation of the service. It calls
@@ -318,7 +318,7 @@ module Engines
 
       \exception contains informations about files that are not in a good state.
     */
-    void checkInputServiceFiles(in string service_name)                                raises(SALOME::SALOME_Exception);
+    void checkInputFilesToService(in string service_name)                              raises(SALOME::SALOME_Exception);
 
     /*!
       This method adds a input Salome_file to a service of the component.
@@ -345,8 +345,8 @@ module Engines
       \exception contains informations of what if the component cannot 
       sends the file's reference.
     */
-    Engines::Salome_file getOutputServiceSalome_file(in string service_name, 
-                                                    in string Salome_file_name) raises(SALOME::SALOME_Exception);
+    Engines::Salome_file getOutputFileToService(in string service_name, 
+                                               in string Salome_file_name) raises(SALOME::SALOME_Exception);
 
     /*!
       This method is used at the end of the service. It calls
@@ -363,7 +363,7 @@ module Engines
 
       \exception contains informations about files that are not in a good state.
     */
-    void checkOutputServiceFiles(in string service_name)                        raises(SALOME::SALOME_Exception);
+    void checkOutputFilesToService(in string service_name)                      raises(SALOME::SALOME_Exception);
 
     /*!
       This method adds an output Salome_file to a service of the component.

diff --git a/idl/SALOME_Component.xml b/idl/SALOME_Component.xml
index 850f18a07ea2b2dbecd4023db9911a4d7ee3c3b8..2b65d90589cc6fadc851e589396b93d3c53486f9 100644 (file)
--- a/idl/SALOME_Component.xml
+++ b/idl/SALOME_Component.xml
@@ -47,11 +47,11 @@
  <Interface>
   <Name>Component</Name>
   <Method>
-   <Name>setInputServiceSalome_file</Name>
+   <Name>setInputFileToService</Name>
    <Type>distributed</Type>
   </Method>
   <Method>
-   <Name>setOutputServiceSalome_file</Name>
+   <Name>setOutputFileToService</Name>
    <Type>distributed</Type>
   </Method>
  </Interface>

diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx
index ae2250f05e0b638317c6fda56c2253fc0c05a6f4..6499555b36992d1c2a3c936893cfec8371f30342 100644 (file)
--- a/src/Container/Component_i.cxx
+++ b/src/Container/Component_i.cxx
@@ -835,8 +835,8 @@ Engines::TMPFile* Engines_Component_i::DumpPython(CORBA::Object_ptr theStudy,
 }
 
 Engines::Salome_file_ptr 
-Engines_Component_i::getInputServiceSalome_file(const char* service_name, 
-                                               const char* Salome_file_name) 
+Engines_Component_i::getInputFileToService(const char* service_name, 
+                                          const char* Salome_file_name) 
 {
   // Try to find the service, if it doesn't exist, we throw an exception.
   _Service_file_map_it = _Input_Service_file_map.find(service_name);
@@ -895,7 +895,7 @@ Engines_Component_i::setInputFileToService(const char* service_name,
 }
 
 void 
-Engines_Component_i::checkInputServiceFiles(const char* service_name) 
+Engines_Component_i::checkInputFilesToService(const char* service_name) 
 {
   // Try to find the service, if it doesn't exist, nothing to do.
   _Service_file_map_it = _Input_Service_file_map.find(service_name);
@@ -912,8 +912,8 @@ Engines_Component_i::checkInputServiceFiles(const char* service_name)
 }
 
 Engines::Salome_file_ptr 
-Engines_Component_i::getOutputServiceSalome_file(const char* service_name, 
-                                               const char* Salome_file_name) 
+Engines_Component_i::getOutputFileToService(const char* service_name, 
+                                           const char* Salome_file_name) 
 {
   // Try to find the service, if it doesn't exist, we throw an exception.
   _Service_file_map_it = _Output_Service_file_map.find(service_name);
@@ -972,7 +972,7 @@ Engines_Component_i::setOutputFileToService(const char* service_name,
 }
 
 void 
-Engines_Component_i::checkOutputServiceFiles(const char* service_name) 
+Engines_Component_i::checkOutputFilesToService(const char* service_name) 
 {
   // Try to find the service, if it doesn't exist, nothing to do.
   _Service_file_map_it = _Output_Service_file_map.find(service_name);

diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx
index 28674d07e25876b0da24e1e01f18c3d4a1c2e333..c18d3d24539a116b64264a3b3c31b6d07cd13cb6 100644 (file)
--- a/src/Container/SALOME_Component_i.hxx
+++ b/src/Container/SALOME_Component_i.hxx
@@ -96,16 +96,17 @@ public:
                                      CORBA::Boolean isPublished,
                                      CORBA::Boolean& isValidScript);
 
- virtual Engines::Salome_file_ptr getInputServiceSalome_file(const char* service_name, 
-                                                            const char* Salome_file_name);
- virtual Engines::Salome_file_ptr getOutputServiceSalome_file(const char* service_name, 
+ // CORBA operations for Salome_file
+ virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name, 
+                                                       const char* Salome_file_name);
+ virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name, 
                                                              const char* Salome_file_name);
 
- virtual void checkInputServiceFiles(const char* service_name);
+ virtual void checkInputFilesToService(const char* service_name);
  virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name, 
                                                        const char* Salome_file_name);
 
- virtual void checkOutputServiceFiles(const char* service_name);
+ virtual void checkOutputFilesToService(const char* service_name);
  virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name, 
                                                         const char* Salome_file_name);
   // --- local C++ methods

diff --git a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
index 245a6f791b2b4b054aa83c248a980868ef339901..4daf505a421dfea6690f8817ba15f6a8e22f0437 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
+++ b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
@@ -1000,8 +1000,8 @@ Engines_Parallel_Component_i::setOutputFileToService(const char* service_name,
 }
 
 Engines::Salome_file_ptr 
-Engines_Parallel_Component_i::getInputServiceSalome_file(const char* service_name, 
-                                               const char* Salome_file_name) 
+Engines_Parallel_Component_i::getInputFileToService(const char* service_name, 
+                                                   const char* Salome_file_name) 
 {
   // Try to find the service, if it doesn't exist, we throw an exception.
   _Proxy_Service_file_map_it = _Proxy_Input_Service_file_map.find(service_name);
@@ -1028,8 +1028,8 @@ Engines_Parallel_Component_i::getInputServiceSalome_file(const char* service_nam
 }
 
 Engines::Salome_file_ptr 
-Engines_Parallel_Component_i::getOutputServiceSalome_file(const char* service_name, 
-                                               const char* Salome_file_name) 
+Engines_Parallel_Component_i::getOutputFileToService(const char* service_name, 
+                                                    const char* Salome_file_name) 
 {
   // Try to find the service, if it doesn't exist, we throw an exception.
   _Proxy_Service_file_map_it = _Proxy_Output_Service_file_map.find(service_name);
@@ -1057,7 +1057,7 @@ Engines_Parallel_Component_i::getOutputServiceSalome_file(const char* service_na
 
 
 void 
-Engines_Parallel_Component_i::checkInputServiceFiles(const char* service_name) 
+Engines_Parallel_Component_i::checkInputFilesToService(const char* service_name) 
 {
   // Try to find the service, if it doesn't exist, nothing to do.
   _Proxy_Service_file_map_it = _Proxy_Input_Service_file_map.find(service_name);
@@ -1074,7 +1074,7 @@ Engines_Parallel_Component_i::checkInputServiceFiles(const char* service_name)
 }
 
 void 
-Engines_Parallel_Component_i::checkOutputServiceFiles(const char* service_name) 
+Engines_Parallel_Component_i::checkOutputFilesToService(const char* service_name) 
 {
   // Try to find the service, if it doesn't exist, nothing to do.
   _Proxy_Service_file_map_it = _Proxy_Output_Service_file_map.find(service_name);

diff --git a/src/ParallelContainer/SALOME_ParallelComponent_i.hxx b/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
index 5355d5f9f1d4bfaf9581e2ee3668a984b47dbee9..cad498524d8ce68509fab891622e1890faabdf10 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelComponent_i.hxx
@@ -99,20 +99,22 @@ public:
                                      CORBA::Boolean isPublished,
                                      CORBA::Boolean& isValidScript);
 
- virtual Engines::Salome_file_ptr getInputServiceSalome_file(const char* service_name, 
-                                                            const char* Salome_file_name);
- virtual Engines::Salome_file_ptr getOutputServiceSalome_file(const char* service_name, 
-                                                             const char* Salome_file_name);
+ // CORBA operations for Salome_file
+ virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name, 
+                                                       const char* Salome_file_name);
+ virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name, 
+                                                        const char* Salome_file_name);
 
- virtual void checkInputServiceFiles(const char* service_name);
+ virtual void checkInputFilesToService(const char* service_name);
  virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name, 
                                                        const char* Salome_file_name);
 
- virtual void checkOutputServiceFiles(const char* service_name);
+ virtual void checkOutputFilesToService(const char* service_name);
  virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name, 
                                                         const char* Salome_file_name);
 
  void send_parallel_proxy_object(CORBA::Object_ptr proxy_ref);
+
   // --- local C++ methods
 
   PortableServer::ObjectId * getId();