This commit was generated by cvs2git to create tag 'V1_3_0'.

[modules/kernel.git] / src / ModuleCatalog / SALOME_ModuleCatalog_impl.cxx

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index b6533ad5040e6d5b5e500fc30cabe69917765016..9f912a7d3b4f430c6e9ccfac9a38999c055a39d6 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -186,7 +186,7 @@ SALOME_ModuleCatalogImpl::GetComponentList()
   for (unsigned int ind=0; ind < _personal_module_list.size();ind++)
     {
        _list_components[ind]=(_personal_module_list[ind].Parsercomponentname).c_str();
-       //SCRUTE(_list_components[ind]) ;
+       SCRUTE(_list_components[ind]) ;
     }
 
   int indice = _personal_module_list.size() ;
@@ -206,18 +206,19 @@ SALOME_ModuleCatalogImpl::GetComponentList()
        }
       if (!_find)
        {
-         //MESSAGE("A new component " << _general_module_list[ind].Parsercomponentname << " has to be to added in the list");
+         MESSAGE("A new component " << _general_module_list[ind].Parsercomponentname << " has to be to added in the list");
           _list_components->length(indice+1);
          // The component is not already defined => has to be taken
          _list_components[indice]=(_general_module_list[ind].Parsercomponentname).c_str();   
-         //SCRUTE(_list_components[indice]) ;
+         SCRUTE(_list_components[indice]) ;
 
          indice++;
        }
-      // else 
-       //MESSAGE("The component " <<_general_module_list[ind].Parsercomponentname << " was already defined in the personal catalog") ;
+      else 
+       MESSAGE("The component " <<_general_module_list[ind].Parsercomponentname << " was already defined in the personal catalog") ;
      }
 
+  MESSAGE ( "End of GetComponentList" )
   return _list_components._retn();
 }
 
@@ -243,6 +244,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
   for (unsigned int ind=0; ind < _personal_module_list.size();ind++)
     {
        _list_components_icone[ind].modulename=(_personal_module_list[ind].Parsercomponentname).c_str();
+       _list_components_icone[ind].moduleusername=(_personal_module_list[ind].Parsercomponentusername).c_str();
        _list_components_icone[ind].moduleicone=(_personal_module_list[ind].Parsercomponenticone).c_str();
        //SCRUTE(_list_components_icone[ind].modulename); 
        //SCRUTE(_list_components_icone[ind].moduleicone);
@@ -269,6 +271,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
           _list_components_icone->length(indice+1);
          // The component is not already defined => has to be taken
          _list_components_icone[indice].modulename=(_general_module_list[ind].Parsercomponentname).c_str();  
+         _list_components_icone[indice].moduleusername=(_general_module_list[ind].Parsercomponentusername).c_str();  
          _list_components_icone[indice].moduleicone=(_general_module_list[ind].Parsercomponenticone).c_str(); 
          //SCRUTE(_list_components_icone[indice].modulename) ;
          //SCRUTE(_list_components_icone[indice].moduleicone);
@@ -391,6 +394,7 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* componentname)
   _list_interfaces.length(0);
   char* _constraint = NULL;
   char* _icone = NULL;
+  char* _componentusername = NULL;
   SALOME_ModuleCatalog::ComponentType _componenttype = SALOME_ModuleCatalog::OTHER; // default initialisation
   CORBA::Boolean _componentmultistudy = false ; // default initialisation
   ListOfPathPrefix _pathes ;
@@ -451,6 +455,9 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* componentname)
          // get component icone
          _icone = CORBA::string_dup(_personal_module_list[ind].Parsercomponenticone.c_str());
 
+         // get component user name
+         _componentusername = CORBA::string_dup(_personal_module_list[ind].Parsercomponentusername.c_str());
+
          // get component interfaces
          _list_interfaces = duplicate_interfaces(_personal_module_list[ind].ParserListInterface);
 
@@ -464,6 +471,7 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* componentname)
     {
       SALOME_ModuleCatalog_AcomponentImpl* aComponentImpl = 
        new SALOME_ModuleCatalog_AcomponentImpl(componentname,
+                                               _componentusername,
                                                _constraint,
                                                _componenttype,
                                                _componentmultistudy,
@@ -523,6 +531,9 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* componentname)
              // get component icone
              _icone = CORBA::string_dup(_general_module_list[ind].Parsercomponenticone.c_str());
 
+             // get component user name
+             _componentusername = CORBA::string_dup(_general_module_list[ind].Parsercomponentusername.c_str());
+
              // get component interfaces
              _list_interfaces = duplicate_interfaces(_general_module_list[ind].ParserListInterface);
 
@@ -535,6 +546,7 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* componentname)
        {
          SALOME_ModuleCatalog_AcomponentImpl* aComponentImpl = 
            new SALOME_ModuleCatalog_AcomponentImpl(componentname,
+                                                   _componentusername,
                                                    _constraint,
                                                    _componenttype,
                                                    _componentmultistudy,