[EDF29576] : log cleaning

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
index 721c6becaaa0803bb806aa93b546e38c99aba0c5..8cf6c7692e76a58e651ca029d5f85e5d3a4a6a7f 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
@@ -44,9 +44,6 @@ UNEXPECT_CATCH(MC_NotFound, SALOME_ModuleCatalog::NotFound)
 SALOME_ModuleCatalog_AcomponentImpl::SALOME_ModuleCatalog_AcomponentImpl
 (SALOME_ModuleCatalog::ComponentDef &C) : _Component(C)
 {
-  BEGIN_OF("SALOME_ModuleCatalog_AcomponentImpl");
-
-  END_OF("SALOME_ModuleCatalog_AcomponentImpl");
 }
 
 //----------------------------------------------------------------------
@@ -55,9 +52,6 @@ SALOME_ModuleCatalog_AcomponentImpl::SALOME_ModuleCatalog_AcomponentImpl
 //----------------------------------------------------------------------
 SALOME_ModuleCatalog_AcomponentImpl::~SALOME_ModuleCatalog_AcomponentImpl()
 {
-  BEGIN_OF("~SALOME_ModuleCatalog_AcomponentImpl");
-
-  END_OF("~SALOME_ModuleCatalog_AcomponentImpl");
 }
 
 //----------------------------------------------------------------------
@@ -67,8 +61,6 @@ SALOME_ModuleCatalog_AcomponentImpl::~SALOME_ModuleCatalog_AcomponentImpl()
 SALOME_ModuleCatalog::ListOfInterfaces* 
 SALOME_ModuleCatalog_AcomponentImpl::GetInterfaceList() 
 {
-  BEGIN_OF("GetInterfaceList");
-
   SALOME_ModuleCatalog::ListOfInterfaces_var _list 
     = new SALOME_ModuleCatalog::ListOfInterfaces;
 
@@ -82,11 +74,7 @@ SALOME_ModuleCatalog_AcomponentImpl::GetInterfaceList()
   for (unsigned int ind = 0; ind < _length_interfaces; ind++)
     {
       _list[ind] = CORBA::string_dup(_Component.interfaces[ind].interfacename);
-      MESSAGE("The component " << _Component.name 
-                          << " contains " << _list[ind] << " as interface");
     }
-  
-  END_OF("GetInterfaceList");
   return _list._retn();
 }
 
@@ -97,9 +85,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetInterfaceList()
 SALOME_ModuleCatalog::DefinitionInterface*
 SALOME_ModuleCatalog_AcomponentImpl::GetInterface(const char* interfacename)
 {
-  BEGIN_OF("GetInterface");
-  SCRUTE(interfacename);
-
   SALOME_ModuleCatalog::DefinitionInterface *_interface =
           new SALOME_ModuleCatalog::DefinitionInterface;
 
@@ -118,8 +103,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetInterface(const char* interfacename)
           duplicate(*_interface, I);
         }
     }
-
-  SCRUTE(_find);
   if (!_find)
     {
       // The interface was not found, the exception should be thrown
@@ -131,9 +114,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetInterface(const char* interfacename)
       MESSAGE(message);
       throw SALOME_ModuleCatalog::NotFound(message.c_str());
     }
-
-  END_OF("GetInterface");
-
   return _interface;
 }
 
@@ -147,9 +127,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetInterface(const char* interfacename)
 SALOME_ModuleCatalog::ListOfServices* 
 SALOME_ModuleCatalog_AcomponentImpl::GetServiceList(const char* interfacename)
 {
-  BEGIN_OF("GetServiceList");
-  SCRUTE(interfacename);
-
   SALOME_ModuleCatalog::ListOfServices_var _list 
     = new SALOME_ModuleCatalog::ListOfServices;
 
@@ -188,8 +165,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetServiceList(const char* interfacename)
       MESSAGE(message);
       throw SALOME_ModuleCatalog::NotFound(message.c_str());
     }
-
-  END_OF("GetServiceList");
   return _list._retn();
 }
 
@@ -202,10 +177,6 @@ SALOME_ModuleCatalog::Service*
 SALOME_ModuleCatalog_AcomponentImpl::GetService(const char* interfacename, 
                                                 const char* servicename) 
 {
-  BEGIN_OF("GetService");
-  SCRUTE(interfacename);
-  SCRUTE(servicename);
-
   Unexpect aCatch( MC_NotFound );
   SALOME_ModuleCatalog::Service *service = new SALOME_ModuleCatalog::Service;
 
@@ -241,8 +212,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetService(const char* interfacename,
 
         }
     }
-  
-  SCRUTE(_find);
   if (!_find)
     {
       // The interface was not found, the exception should be thrown
@@ -256,8 +225,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetService(const char* interfacename,
       MESSAGE(message);
       throw SALOME_ModuleCatalog::NotFound(message.c_str());
     }
-
-  END_OF("GetService");
   return service;
 }
 
@@ -268,9 +235,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetService(const char* interfacename,
 SALOME_ModuleCatalog::Service* 
 SALOME_ModuleCatalog_AcomponentImpl::GetDefaultService(const char* interfacename) 
 {
-  BEGIN_OF("GetDefaultService");
-  SCRUTE(interfacename);
-
   Unexpect aCatch( MC_NotFound );
   SALOME_ModuleCatalog::Service *_service = new  SALOME_ModuleCatalog::Service;
 
@@ -309,8 +273,6 @@ SALOME_ModuleCatalog_AcomponentImpl::GetDefaultService(const char* interfacename
       MESSAGE(message);
       throw SALOME_ModuleCatalog::NotFound(message.c_str());
     }
-
-  END_OF("GetDefaultService");
   return _service;
 }
 
@@ -493,7 +455,6 @@ void SALOME_ModuleCatalog_AcomponentImpl::duplicate
   
   // duplicate out DataStreamParameters
   _length = S_in.ServiceoutDataStreamParameter.length();
-  SCRUTE(_length);
   S_out.ServiceoutDataStreamParameter.length(_length);
   
   for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++)
@@ -511,7 +472,6 @@ void SALOME_ModuleCatalog_AcomponentImpl::duplicate
   
   // duplicate service list
   unsigned int _length = I_in.interfaceservicelist.length();
-  SCRUTE(_length);
   I_out.interfaceservicelist.length(_length);
   
   for (unsigned int ind1 = 0; ind1 < _length ; ind1 ++)

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index b1df735c1e817140f164507b6971593d226cf86d..90db1fabdc8eb2ff92a382af00da31cd82db8ff0 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -492,12 +492,9 @@ SALOME_ModuleCatalogImpl::GetComponentList()
         _find = true;
     }
     if(!_find){
-      MESSAGE("A new component " << myPrivate->_general_module_list[ind].name 
-                          << " has to be to added in the list");
       _list_components->length((CORBA::ULong)indice+1);
       // The component is not already defined => has to be taken
       _list_components[(CORBA::ULong)indice]=(myPrivate->_general_module_list[ind].name).c_str();
-      SCRUTE(_list_components[(CORBA::ULong)indice]) ;
       
       indice++;
     }else{
@@ -1055,8 +1052,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
   P_corba.Parametertype = CORBA::string_dup(P_parser.type.c_str());
 
   // duplicate parameter dependency
-  
-  SCRUTE(P_parser.dependency);
+
   P_corba.Parameterdependency = SALOME_ModuleCatalog::DATASTREAM_UNDEFINED;
   for (it_dep = DataStreamDepConvert.begin(); 
        it_dep != DataStreamDepConvert.end(); 
@@ -1065,8 +1061,6 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
       P_corba.Parameterdependency = it_dep->second;
       break;
     }
-
-  SCRUTE(P_corba.Parameterdependency);
 }
 
 //----------------------------------------------------------------------