From 0c899895a2ce630522c628466a1ddacd0c5d6ffd Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 15 Oct 2018 15:17:25 +0300 Subject: [PATCH] Typo and whitespace fixes by Kunda http://www.salome-platform.org/forum/forum_9/454200149#834683007 --- bin/PortManager.py | 4 +- .../concurrentSession/TestMinimalExample.py | 6 +- bin/killSalomeWithPort.py | 2 +- bin/launchConfigureParser.py | 2 +- doc/README.cluster-CCRT | 7 +- doc/salome/running_salome.dox | 2 +- idl/SALOMEDS.idl | 16 +- src/HDFPersist/HDFnObjects.c | 9 +- src/Launcher/Test/test_stress.sh | 4 +- src/NamingService/SALOME_NamingService.cxx | 127 ++++++------ .../SALOME_ParallelComponent_i.cxx | 188 +++++++++--------- .../Test/SALOMEDSTest_AttributePixMap.cxx | 2 +- .../SALOMEDSTest_AttributePythonObject.cxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx | 37 ++-- 14 files changed, 202 insertions(+), 206 deletions(-) diff --git a/bin/PortManager.py b/bin/PortManager.py index 6f3d7b29e..9eb6e7ebd 100644 --- a/bin/PortManager.py +++ b/bin/PortManager.py @@ -132,7 +132,7 @@ def __isNetworkConnectionActiveOnPort(port): return False # -def getPort(preferedPort=None): +def getPort(preferredPort=None): logger.debug("GET PORT") config_file, lock_file = _getConfigurationFilename() @@ -159,7 +159,7 @@ def getPort(preferedPort=None): config[appli_path] = [] # append port - port = preferedPort + port = preferredPort if not port or __isPortUsed(port, config): port = __PORT_MIN_NUMBER while __isPortUsed(port, config): diff --git a/bin/appliskel/tests/concurrentSession/TestMinimalExample.py b/bin/appliskel/tests/concurrentSession/TestMinimalExample.py index 03bd30e6a..277ba73a3 100644 --- a/bin/appliskel/tests/concurrentSession/TestMinimalExample.py +++ b/bin/appliskel/tests/concurrentSession/TestMinimalExample.py @@ -24,10 +24,10 @@ import multiprocessing import unittest import logging -def port_reservation(obtained_ports, prefered=None, test=None, expected=None): +def port_reservation(obtained_ports, preferred=None, test=None, expected=None): from PortManager import getPort - if prefered: - port = getPort(prefered) + if preferred: + port = getPort(preferred) else: port = getPort() print("obtained port = %s"%port) diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index fec9e4aa3..ed202d964 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -71,7 +71,7 @@ def getPiDict(port,appname='salome',full=True,hidden=True,hostname=None): # full path to the pidict file is requested if hidden: # new-style dot-prefixed pidict files - # are in the system-dependant temporary diretory + # are in the system-dependant temporary directory dir = getLogDir() else: # old-style non-dot-prefixed pidict files diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index e52313342..a9a7f7076 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -825,7 +825,7 @@ def get_env(appname=salomeappname, cfgname=salomecfgname, exeName=None): # - These directories are analyzed beginning from the last one in the list, # so the first directory listed in "Config" environment variable # has higher priority: it means that if some configuration options - # is found in the next analyzed cofiguration file - it will be replaced + # is found in the next analyzed configuration file - it will be replaced # - The last configuration file which is parsed is user configuration file # situated in the home directory (if it exists): # * ~/.config/salome/.rc[.]" for Linux (e.g. ~/.config/salome/.SalomeApprc.6.4.0) diff --git a/doc/README.cluster-CCRT b/doc/README.cluster-CCRT index ee80c995b..05ec0f71e 100644 --- a/doc/README.cluster-CCRT +++ b/doc/README.cluster-CCRT @@ -31,9 +31,9 @@ And one or more python scripts may be executed Warnings ======== -The list of needed modules must be explicited with --modules option +The list of needed modules must be invoked with --modules option -It is not possible to use embbedded components, so we must use --standalone option +It is not possible to use embedded components, so we must use --standalone option After the python script(s) listed in the --terminal option, ",killall" should be added : so the processes of Salome will be killed after the execution of @@ -43,7 +43,7 @@ the python script(s). Examples ======== -Sans IHM sans execution de script python (for interactive testing and developping) : +Sans IHM sans execution de script python (for interactive testing and developing) : --------------------------------------------- runSalome --terminal --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger @@ -80,4 +80,3 @@ Queue for execution that file (here runSalome.batch) : bsub < runSalome.batch See the "bsub" documentation for details (or "man bsub") - diff --git a/doc/salome/running_salome.dox b/doc/salome/running_salome.dox index 109563c15..47639df51 100644 --- a/doc/salome/running_salome.dox +++ b/doc/salome/running_salome.dox @@ -94,6 +94,6 @@ Launch with interactive Python console. - --interp=n or -i=n Number of additional Python interpreters to open, with session -environment propely set-up. +environment properly set-up. */ diff --git a/idl/SALOMEDS.idl b/idl/SALOMEDS.idl index e063ff7ad..3bfe4e751 100644 --- a/idl/SALOMEDS.idl +++ b/idl/SALOMEDS.idl @@ -384,7 +384,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin exception StudyNameError {}; //! Invalid study comment exception StudyCommentError {}; - + /*! Determines whether the server has already been loaded or not. */ @@ -558,7 +558,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin /*! \brief Get a new %UseCaseBuilder. */ UseCaseBuilder GetUseCaseBuilder() raises(StudyInvalidReference); - + /*! \brief Clear a study object */ void Clear() raises(StudyInvalidReference); @@ -566,14 +566,14 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin /*! \brief Initialization a study object */ void Init() raises(StudyInvalidReference); - + /*! \brief Open a study by url Reads and activates the structure of the study %Objects. \param aStudyUrl The path to the study */ boolean Open (in URLPath aStudyUrl) raises (SALOME::SALOME_Exception); - + /*! \brief Saving the study in a file (or files). Saves a study. @@ -581,11 +581,11 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin \param theASCII If this parameter is True the study will be saved in ASCII format, otherwise in HDF format. */ boolean Save(in boolean theMultiFile, in boolean theASCII) raises(StudyInvalidReference); - + /*! \brief Saving the study in a specified file (or files). Saves the study in a specified file (or files). - \param aUrl The path to the definite file in whcih the study will be saved + \param aUrl The path to the definite file in which the study will be saved \param theMultiFile If this parameter is True the study will be saved in several files. \param theASCII If this parameter is True the study will be saved in ASCII format, otherwise in HDF format. @@ -593,8 +593,8 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin */ boolean SaveAs(in URLPath aUrl, // if the file already exists in boolean theMultiFile, // overwrite (as option) - in boolean theASCII) - raises(StudyInvalidReference); + in boolean theASCII) + raises(StudyInvalidReference); /*! Returns True, if the given %SObject can be copied to the clipboard. */ diff --git a/src/HDFPersist/HDFnObjects.c b/src/HDFPersist/HDFnObjects.c index 1a9d734ab..da77d5f1d 100644 --- a/src/HDFPersist/HDFnObjects.c +++ b/src/HDFPersist/HDFnObjects.c @@ -31,14 +31,14 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) /* * - Name : HDFnObjects - * - Description : returns the number of HDF objets in a HDF group + * - Description : returns the number of HDF objects in an HDF group * - Parameters : * - fid (IN) : HDF file ID * - path (IN) : access path to the HDF group in the HDF file * - Results : * - if success : number of objects - * - if failure : -1 - */ + * - if failure : -1 + */ hdf_err Num(hdf_idt id,const char *name, void *data); @@ -59,10 +59,9 @@ HDFnObjects(hdf_idt fid,const char *path,int *n) hdf_err Num(hdf_idt id,const char *name, void *data) { int *count; - + count = (int *) data; (*count)++; return 0; } - diff --git a/src/Launcher/Test/test_stress.sh b/src/Launcher/Test/test_stress.sh index 4ed5a050c..88505fab8 100755 --- a/src/Launcher/Test/test_stress.sh +++ b/src/Launcher/Test/test_stress.sh @@ -1,5 +1,5 @@ #! /bin/bash -# This test launches in parallel a greate number of instancies of a usual use case +# This test launches in parallel a great number of instances of a usual use case WORKDIR=`mktemp -d` echo WORKDIR: $WORKDIR cat > $WORKDIR/command.sh <<< 'echo "OK" > result.txt' @@ -21,4 +21,4 @@ do done # list of error files not empty ls -l $WORKDIR/*.err | awk '{if ($5 != "0") print $0}' -exit $exit_code \ No newline at end of file +exit $exit_code diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index a8c213b03..797edefdf 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -50,7 +50,7 @@ * * After Default Constructor, one needs to initialize ORB. * \sa init_orb(CORBA::ORB_ptr orb), SALOME_NamingService(CORBA::ORB_ptr orb) - */ + */ // ============================================================================ SALOME_NamingService::SALOME_NamingService() @@ -60,11 +60,11 @@ SALOME_NamingService::SALOME_NamingService() } // ============================================================================ -/*! \brief Standard Constructor, with ORB reference. - * +/*! \brief Standard Constructor, with ORB reference. + * * Initializes the naming service root context * \param orb CORBA::ORB_ptr arguments - */ + */ // ============================================================================ SALOME_NamingService::SALOME_NamingService(CORBA::ORB_ptr orb) @@ -77,7 +77,7 @@ SALOME_NamingService::SALOME_NamingService(CORBA::ORB_ptr orb) /*! \brief Standard destructor. * * The standard destructor does nothing special. - */ + */ // ============================================================================ SALOME_NamingService::~SALOME_NamingService() @@ -89,12 +89,12 @@ SALOME_NamingService::~SALOME_NamingService() // ============================================================================ /*! \brief initializes ORB reference and naming service root context. - * + * * Initializes ORB reference and naming service root context. * For use after default constructor. * If param orb is null, the orb is initialized * \param orb CORBA::ORB_ptr arguments - */ + */ // ============================================================================ void SALOME_NamingService::init_orb(CORBA::ORB_ptr orb) @@ -124,12 +124,12 @@ void SALOME_NamingService::init_orb(CORBA::ORB_ptr orb) * as an absolute pathname. Else, pathname is taken as a relative * path, to current context. Prefer absolute pathname, relative * pathname are not safe, when SALOME_NamingService object is - * shared or use in multithreaded context. + * shared or use in multithreaded context. * If the path ends with '/', only a directory is created. * \sa Change_Directory(const char* Path), * Create_Directory(const char* Path) * CORBA::Object_ptr Resolve(const char* Path) - */ + */ // ============================================================================ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, @@ -161,7 +161,7 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, // A directory is treated (not only an object name) // test if the directory where ObjRef should be recorded already exists // If not, create the new context - + try{ CORBA::Object_var obj = _current_context->resolve(context_name); _current_context = CosNaming::NamingContext::_narrow(obj); @@ -313,9 +313,9 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, // ============================================================================ /*! \brief get the CORBA object reference associated to a name. - * + * * get the CORBA object reference associated to a complete name with a path. - * If the NamingService is out, the exception ServiceUnreachable is thrown + * If the NamingService is out, the exception ServiceUnreachable is thrown * \param Path pathname. If the pathname begins with a '/', pathname is taken * as an absolute pathname. Else, pathname is taken as a relative * path, to current context. Prefer absolute pathname, relative @@ -325,7 +325,7 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, * or nil reference in other cases. * \sa Register(CORBA::Object_ptr ObjRef, const char* Path), * Change_Directory(const char* Path) - */ + */ // ============================================================================ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) @@ -404,7 +404,7 @@ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) * * get the CORBA object reference associated to an incomplete name with a * path. Look for the first occurrence of name*. - * If the NamingService is out, the exception ServiceUnreachable is thrown + * If the NamingService is out, the exception ServiceUnreachable is thrown * \param Path pathname under the form "/path/name" (Absolute reference !) * search the fist reference like "/path(.dir)/name*(.kind)" * \return the object reference if found, or nil reference. @@ -438,19 +438,19 @@ CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) isOk =true; else isOk = Change_Directory(basePath.c_str()); - + if (isOk) { std::vector listElem = list_directory(); std::vector::iterator its = listElem.begin(); - + while (its != listElem.end()) { if ((*its).find(name) == 0) { return Resolve((*its).c_str()); } - + its++; } } @@ -468,12 +468,12 @@ CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) * \param hostname name of the machine on which the component is searched. * \param containerName name of the container in which the component is instantiated. - * \param componentName name of the component we are looking for an existing + * \param componentName name of the component we are looking for an existing instance. * \param nbproc in case of multi processor machine, container name is * suffixed with _nbproc. * \return the object reference - */ + */ // ============================================================================ CORBA::Object_ptr @@ -664,7 +664,7 @@ std::string SALOME_NamingService::BuildContainerNameForNS(const Engines::Contain * \param name the name to search. * \return number of occurrences found. * \sa Change_Directory(const char* Path) - */ + */ // ============================================================================ int SALOME_NamingService::Find(const char* name) @@ -692,7 +692,7 @@ throw(ServiceUnreachable) // ============================================================================ /*! \brief Creates a directory (context_name) * - * Creates a directory (context_name) relative to the current directory + * Creates a directory (context_name) relative to the current directory * (current context) or relative to the root directory (root context), if * the path given begins with a '/'. * If the NamingService is out, the exception ServiceUnreachable is thrown. @@ -701,13 +701,13 @@ throw(ServiceUnreachable) * as an absolute pathname. Else, pathname is taken as a relative * path, to current context. Prefer absolute pathname, relative * pathname are not safe, when SALOME_NamingService object is - * shared or use in multithreaded context. + * shared or use in multithreaded context. * \return true if successful * (creation not strictly guaranteed if true, because Register may * catch some specific unlikely exception without throw anything * --- to be corrected ---) * \sa RegisterCORBA::Object_ptr ObjRef, const char* Path) - */ + */ // ============================================================================ bool SALOME_NamingService::Create_Directory(const char* Path) throw(ServiceUnreachable) @@ -730,7 +730,7 @@ bool SALOME_NamingService::Create_Directory(const char* Path) throw(ServiceUnrea } // --- path must end with '/' - + if (path[path.length()-1] != '/') path += '/'; Register(CORBA::Object::_nil(), path.c_str()); @@ -748,7 +748,7 @@ bool SALOME_NamingService::Create_Directory(const char* Path) throw(ServiceUnrea * If the NamingService is out, the exception ServiceUnreachable is thrown. * \param Path the new current directory * \return true if the change succeeded - */ + */ // ============================================================================ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnreachable) @@ -781,7 +781,7 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea // --- need to resolve directory path ASSERT(!CORBA::is_nil(current_context)); - + if (path[path.length()-1] != '/') path += '/'; // SCRUTE(path); CosNaming::Name context_name; @@ -790,9 +790,9 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea context_name, splitPath, true); - + // --- Context creation - + try { CORBA::Object_var obj = current_context->resolve(context_name); @@ -801,11 +801,11 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea _current_context = current_context; changeOK = true; } - + catch (CosNaming::NamingContext::NotFound& ex) { CosNaming::Name n = ex.rest_of_name; - + if (ex.why == CosNaming::NamingContext::missing_node) MESSAGE( "Change_Directory() : " << (char *) n[0].id << " (" << (char *) n[0].kind << ") not found"); @@ -818,17 +818,17 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea << " (" << (char *) n[0].kind << ") is not an object" ); } - + catch (CosNaming::NamingContext::CannotProceed&) { INFOS("Change_Directory(): CosNaming::NamingContext::CannotProceed"); } - + catch (CosNaming::NamingContext::InvalidName&) { INFOS("Change_Directory(): CosNaming::NamingContext::InvalidName"); } - + catch (CORBA::SystemException&) { INFOS("Change_Directory():CORBA::SystemException : unable to contact" @@ -846,7 +846,7 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea * If the NamingService is out, the exception ServiceUnreachable is thrown. * \return the path of the current_context * \sa _current_directory - */ + */ // ============================================================================ char *SALOME_NamingService::Current_Directory() throw(ServiceUnreachable) @@ -896,7 +896,7 @@ char *SALOME_NamingService::Current_Directory() throw(ServiceUnreachable) * List and print via trace all directories and objects in the current * context. Trace must be activated: compile option _DEBUG_ * If the NamingService is out, the exception ServiceUnreachable is thrown - */ + */ // ============================================================================ void SALOME_NamingService::list() throw(ServiceUnreachable) @@ -956,7 +956,7 @@ void SALOME_NamingService::list() throw(ServiceUnreachable) * If the NamingService is out, the exception ServiceUnreachable is thrown. * \return list of strings with objects found. * \sa vector list_directory_recurs() - */ + */ // ============================================================================ std::vector SALOME_NamingService::list_directory() throw(ServiceUnreachable) @@ -1009,7 +1009,7 @@ std::vector SALOME_NamingService::list_directory() throw(ServiceUnr * If the NamingService is out, the exception ServiceUnreachable is thrown. * \return list of strings with directories found. * \sa vector list_directory() - */ + */ // ============================================================================ std::vector SALOME_NamingService::list_subdirs() throw(ServiceUnreachable) @@ -1058,7 +1058,7 @@ std::vector SALOME_NamingService::list_subdirs() throw(ServiceUnrea * If the NamingService is out, the exception ServiceUnreachable is thrown. * \return list of strings with objects found. * \sa vector list_directory() - */ + */ // ============================================================================ std::vector SALOME_NamingService::list_directory_recurs() @@ -1081,9 +1081,9 @@ throw(ServiceUnreachable) /*! \brief destroy an entry in naming service. * * Destroy an association Path - Object Reference. - * If the NamingService is out, the exception ServiceUnreachable is thrown + * If the NamingService is out, the exception ServiceUnreachable is thrown * \param Path object path - */ + */ // ============================================================================ void SALOME_NamingService::Destroy_Name(const char* Path) @@ -1190,7 +1190,7 @@ throw(ServiceUnreachable) CORBA::string_dup(splitPath[dimension_resultat].c_str()); context_name[0].kind = CORBA::string_dup("object"); //SCRUTE(context_name[0].id); - + _current_context->unbind(context_name); //MESSAGE("The object " << context_name[0].id << " has been deleted"); } @@ -1237,7 +1237,7 @@ throw(ServiceUnreachable) * Destroy an empty directory in Naming Service. * If the NamingService is out, the exception ServiceUnreachable is thrown. * \param Path directory path - */ + */ // ============================================================================ void SALOME_NamingService::Destroy_Directory(const char* Path) throw(ServiceUnreachable) @@ -1402,10 +1402,10 @@ void SALOME_NamingService::Destroy_Directory(const char* Path) throw(ServiceUnre /*! \brief Destroy a directory with its contents. * * Destroy the objects associations in a directory, and the directory itself, - * if there is no subdirectories. + * if there is no subdirectories. * If the NamingService is out, the exception ServiceUnreachable is thrown. * \param Path the directory path. - */ + */ // ============================================================================ void SALOME_NamingService::Destroy_FullDirectory(const char* Path) throw(ServiceUnreachable) @@ -1417,7 +1417,7 @@ void SALOME_NamingService::Destroy_FullDirectory(const char* Path) throw(Service for (unsigned int ind = 0; ind < contList.size(); ind++) Destroy_Name(contList[ind].c_str()); - + Destroy_Directory(Path); } } @@ -1426,8 +1426,8 @@ void SALOME_NamingService::Destroy_FullDirectory(const char* Path) throw(Service /*! \brief initialize root context (root directory) * * the root context initialisation must be done when the SALOME_NamingService - * instance is created and before any othe call. See constructors. - */ + * instance is created and before any other call. See constructors. + */ // ============================================================================ void SALOME_NamingService::_initialize_root_context() @@ -1469,7 +1469,7 @@ void SALOME_NamingService::_initialize_root_context() * if false, final object (if any) is included in * context_name. * \return dimension of context_name - */ + */ // ============================================================================ int @@ -1504,7 +1504,7 @@ SALOME_NamingService::_createContextNameDir(std::string path, if (onlyDir) // only directory part { dim = splitPath.size()-1; // omit final object - if (endWithDelim) // unless the path ends with a delimiter + if (endWithDelim) // unless the path ends with a delimiter dim++; endWithDelim = true; } @@ -1540,7 +1540,7 @@ SALOME_NamingService::_createContextNameDir(std::string path, * * \param name the name to search. * \param occurence_number number of occurrence already found (incremented) - */ + */ // ============================================================================ void SALOME_NamingService::_Find(const char* name, @@ -1563,37 +1563,37 @@ void SALOME_NamingService::_Find(const char* name, while (binding_iterator->next_one(binding)) { CosNaming::Name bindingName = binding->binding_name; - + if (binding->binding_type == CosNaming::ncontext) { // --- We work on a directory, // the search should be done in this directory - + Change_Directory(bindingName[0].id); _Find(name, occurence_number); - + // --- We'll go back to the initial context - + _current_context = ref_context ; } - + else if (binding->binding_type == CosNaming::nobject) { // --- We work on an object... - + if (!strcmp( bindingName[0].id, name)) { //MESSAGE("One occurrence was found"); occurence_number++; - + // --- We keep in memory the directory where // one occurrence was found - + found_context = _current_context ; } } } - + binding_iterator->destroy(); } // --- We go to the last directory where an occurrence was found @@ -1605,14 +1605,14 @@ void SALOME_NamingService::_Find(const char* name, // ============================================================================ /*! \brief find the current directory path. - * + * * Parse the naming service tree to find the current context and give the * associated directory path (relative to root context). - * \param splitPath + * \param splitPath * \param lengthResult * \param contextToFind * \param notFound - */ + */ // ============================================================================ void @@ -1703,7 +1703,7 @@ _current_directory(std::vector& splitPath, * \param relativeSubDir The directory relative to absCurDirectory in which * the objects are found. * \param absCurDirectory The current directory, absolute path - */ + */ // ============================================================================ void SALOME_NamingService::_list_directory_recurs(std::vector& myList, @@ -1782,4 +1782,3 @@ CORBA::ORB_ptr SALOME_NamingService::orb() { return _orb; } - diff --git a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx index ddbdb04bd..f351e6c4c 100644 --- a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx +++ b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx @@ -56,7 +56,7 @@ static Engines_Parallel_Component_i * theEngines_Component ; bool Engines_Parallel_Component_i::_isMultiInstance = false; //============================================================================= -/*! +/*! * Standard Constructor for generic Component, used in derived class * Connection to Registry and Notification * \param orb Object Request broker given by Container @@ -69,13 +69,13 @@ bool Engines_Parallel_Component_i::_isMultiInstance = false; //============================================================================= Engines_Parallel_Component_i::Engines_Parallel_Component_i(CORBA::ORB_ptr orb, char * ior, int rank, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, const char *instanceName, const char *interfaceName, bool notif, bool regist) : - InterfaceParallel_impl(orb,ior,rank), + InterfaceParallel_impl(orb,ior,rank), Engines::EngineComponent_serv(orb,ior,rank), Engines::EngineComponent_base_serv(orb,ior,rank), Engines::Parallel_Component_serv(orb,ior,rank), @@ -114,7 +114,7 @@ Engines_Parallel_Component_i::Engines_Parallel_Component_i(CORBA::ORB_ptr orb, c } //============================================================================= -/*! +/*! * Destructor: call Container for decrement of instances count. * When instances count falls to 0, the container tries to remove the * component library (dlclose) @@ -137,7 +137,7 @@ Engines_Parallel_Component_i::~Engines_Parallel_Component_i() } //============================================================================= -/*! +/*! * CORBA method: return name of the instance, unique in this Container */ //============================================================================= @@ -148,7 +148,7 @@ char* Engines_Parallel_Component_i::instanceName() } //============================================================================= -/*! +/*! * CORBA method: return name of the component class */ //============================================================================= @@ -159,7 +159,7 @@ char* Engines_Parallel_Component_i::interfaceName() } //============================================================================= -/*! +/*! * CORBA method: Test if instance is alive and responds */ //============================================================================= @@ -176,7 +176,7 @@ void Engines_Parallel_Component_i::ping() } //============================================================================= -/*! +/*! * CORBA method: Deactivate this instance. CORBA object is deactivated (do not * respond any more to CORBA calls), the connection to Regsitry is removed * (Registry informed of deactivation), internal server reference counter on @@ -198,7 +198,7 @@ void Engines_Parallel_Component_i::destroy() } //============================================================================= -/*! +/*! * CORBA method: return CORBA reference of the Container * */ @@ -212,12 +212,12 @@ Engines::Container_ptr Engines_Parallel_Component_i::GetContainerRef() } //============================================================================= -/*! - * CORBA method: - * Gives a sequence of (key=string,value=any) to the component. +/*! + * CORBA method: + * Gives a sequence of (key=string,value=any) to the component. * Base class component stores the sequence in a map. * The map is cleared before. - * This map is for use by derived classes. + * This map is for use by derived classes. * \param dico sequence of (key=string,value=any) */ //============================================================================= @@ -233,8 +233,8 @@ void Engines_Parallel_Component_i::setProperties(const Engines::FieldsDict& dico } //============================================================================= -/*! - * CORBA method: +/*! + * CORBA method: * returns a previously stored map (key=string,value=any) as a sequence. * (see setProperties) */ @@ -256,7 +256,7 @@ Engines::FieldsDict* Engines_Parallel_Component_i::getProperties() } //============================================================================= -/*! +/*! * CORBA method: used by Supervision to give names to this instance */ //============================================================================= @@ -266,17 +266,17 @@ void Engines_Parallel_Component_i::Names( const char * graphName , { _graphName = graphName; _nodeName = nodeName; - MESSAGE("Engines_Parallel_Component_i::Names( '" << _graphName << "' , '" + MESSAGE("Engines_Parallel_Component_i::Names( '" << _graphName << "' , '" << _nodeName << "' )"); } //============================================================================= -/*! +/*! * CORBA method: used in Supervision */ //============================================================================= -bool Engines_Parallel_Component_i::Kill_impl() +bool Engines_Parallel_Component_i::Kill_impl() { // MESSAGE("Engines_Parallel_Component_i::Kill_i() pthread_t "<< pthread_self() // << " pid " << getpid() << " instanceName " @@ -305,7 +305,7 @@ bool Engines_Parallel_Component_i::Kill_impl() } //============================================================================= -/*! +/*! * CORBA method: used in Supervision */ //============================================================================= @@ -325,7 +325,7 @@ bool Engines_Parallel_Component_i::Stop_impl() << " machineName " << Kernel_Utils::GetHostname().c_str()<< " _id " << hex << _id << dec << " _ThreadId " << _ThreadId ); #endif - + bool RetVal = false ; #ifndef WIN32 @@ -345,7 +345,7 @@ bool Engines_Parallel_Component_i::Stop_impl() } //============================================================================= -/*! +/*! * CORBA method: used in Supervision */ //============================================================================= @@ -377,7 +377,7 @@ bool Engines_Parallel_Component_i::Suspend_impl() { return false ; } - else + else { #ifndef WIN32 RetVal = Killer( _ThreadId ,SIGINT ) ; @@ -392,7 +392,7 @@ bool Engines_Parallel_Component_i::Suspend_impl() } //============================================================================= -/*! +/*! * CORBA method: used in Supervision */ //============================================================================= @@ -419,7 +419,7 @@ bool Engines_Parallel_Component_i::Resume_impl() if ( _ThreadId > 0 && pthread_self().p != _ThreadId->p ) #endif { - if ( _Sleeping ) + if ( _Sleeping ) { _Sleeping = false ; RetVal = true ; @@ -433,8 +433,8 @@ bool Engines_Parallel_Component_i::Resume_impl() } //============================================================================= -/*! - * CORBA method: +/*! + * CORBA method: */ //============================================================================= @@ -474,7 +474,7 @@ CORBA::Long Engines_Parallel_Component_i::CpuUsed_impl() // << _serviceName << " " << cpu << std::endl ; } } - else + else { cpu = _ThreadCpuUsed ; // std::cout << pthread_self() << " Engines_Parallel_Component_i::CpuUsed_impl " @@ -491,7 +491,7 @@ CORBA::Long Engines_Parallel_Component_i::CpuUsed_impl() //============================================================================= -/*! +/*! * C++ method: return Container Servant */ //============================================================================= @@ -502,7 +502,7 @@ Engines_Parallel_Container_i *Engines_Parallel_Component_i::GetContainerPtr() } //============================================================================= -/*! +/*! * C++ method: return CORBA instance id, the id is set in derived class * constructor, when instance is activated. */ @@ -515,7 +515,7 @@ PortableServer::ObjectId * Engines_Parallel_Component_i::getId() } //============================================================================= -/*! +/*! * C++ method: used by derived classes for supervision */ //============================================================================= @@ -587,7 +587,7 @@ void Engines_Parallel_Component_i::beginService(const char *serviceName) } //============================================================================= -/*! +/*! * C++ method: used by derived classes for supervision */ //============================================================================= @@ -610,7 +610,7 @@ void Engines_Parallel_Component_i::endService(const char *serviceName) } //============================================================================= -/*! +/*! * C++ method: -- CHECK IF USED -- */ //============================================================================= @@ -621,7 +621,7 @@ char* Engines_Parallel_Component_i::graphName() } //============================================================================= -/*! +/*! * C++ method: -- CHECK IF USED -- */ //============================================================================= @@ -632,7 +632,7 @@ char* Engines_Parallel_Component_i::nodeName() } //============================================================================= -/*! +/*! * C++ method: used in Supervision (see kill_impl) */ //============================================================================= @@ -670,7 +670,7 @@ bool Engines_Parallel_Component_i::Killer( pthread_t ThreadId , int signum ) perror("Killer pthread_kill error") ; return false ; } - else + else { #ifndef WIN32 MESSAGE(pthread_self() << "Killer : ThreadId " << ThreadId @@ -686,9 +686,9 @@ bool Engines_Parallel_Component_i::Killer( pthread_t ThreadId , int signum ) } //============================================================================= -/*! +/*! * C++ method: - */ + */ //============================================================================= void SetCpuUsed() @@ -698,7 +698,7 @@ void SetCpuUsed() } //============================================================================= -/*! +/*! * C++ method: */ //============================================================================= @@ -706,12 +706,12 @@ void SetCpuUsed() void Engines_Parallel_Component_i::SetCurCpu() { _ThreadCpuUsed = CpuUsed() ; - // MESSAGE(pthread_self() << + // MESSAGE(pthread_self() << // " Engines_Parallel_Component_i::SetCurCpu() _ThreadCpuUsed " << _ThreadCpuUsed) ; } //============================================================================= -/*! +/*! * C++ method: */ //============================================================================= @@ -736,7 +736,7 @@ long Engines_Parallel_Component_i::CpuUsed() else { // std::cout << pthread_self() << "Engines_Parallel_Component_i::CpuUsed _ThreadId " - // << _ThreadId << " " << _serviceName<< " _StartUsed " + // << _ThreadId << " " << _serviceName<< " _StartUsed " // << _StartUsed << std::endl ; } #else @@ -765,7 +765,7 @@ void Engines_Parallel_Component_i::CancelThread() } //============================================================================= -/*! +/*! * C++ method: Send message to event channel */ //============================================================================= @@ -777,7 +777,7 @@ void Engines_Parallel_Component_i::sendMessage(const char *event_type, } //============================================================================= -/*! +/*! * C++ method: return standard library name built on component name */ //============================================================================= @@ -795,12 +795,12 @@ std::string Engines_Parallel_Component_i::GetDynLibraryName(const char *componen #else std::string ret=componentName; ret+="Engine.dll"; -#endif +#endif return ret; } //============================================================================= -/*! +/*! * C++ method: DumpPython default implementation */ //============================================================================= @@ -814,15 +814,15 @@ Engines::TMPFile* Engines_Parallel_Component_i::DumpPython(CORBA::Boolean isPubl strcpy(aBuffer, aScript); CORBA::Octet* anOctetBuf = (CORBA::Octet*)aBuffer; int aBufferSize = strlen(aBuffer)+1; - Engines::TMPFile_var aStreamFile = new Engines::TMPFile(aBufferSize, aBufferSize, anOctetBuf, 1); + Engines::TMPFile_var aStreamFile = new Engines::TMPFile(aBufferSize, aBufferSize, anOctetBuf, 1); isValidScript = true; - return aStreamFile._retn(); + return aStreamFile._retn(); } -Engines::Salome_file_ptr -Engines_Parallel_Component_i::setInputFileToService(const char* service_name, - const char* Salome_file_name) +Engines::Salome_file_ptr +Engines_Parallel_Component_i::setInputFileToService(const char* service_name, + const char* Salome_file_name) { // Try to find the service, if it doesn't exist, we add it. _Service_file_map_it = _Input_Service_file_map.find(service_name); @@ -837,7 +837,7 @@ Engines_Parallel_Component_i::setInputFileToService(const char* service_name, _t_Salome_file_map * _map = _Input_Service_file_map[service_name]; _t_Proxy_Salome_file_map * _proxy_map = _Proxy_Input_Service_file_map[service_name]; _t_IOR_Proxy_Salome_file_map * _IOR_proxy_map = _IOR_Proxy_Input_Service_file_map[service_name]; - + pthread_mutex_lock(deploy_mutex); std::string proxy_ior; @@ -856,16 +856,16 @@ Engines_Parallel_Component_i::setInputFileToService(const char* service_name, if (getMyRank() == 0) { proxy = new Engines::Parallel_Salome_file_proxy_impl(CORBA::ORB::_duplicate(_orb), new paco_omni_fabrique()); - proxy->copyGlobalContext(this); + proxy->copyGlobalContext(this); PaCO::PacoTopology_t serveur_topo; serveur_topo.total = getTotalNode(); proxy->setTopology(serveur_topo); - // We register the CORBA objet into the POA + // We register the CORBA object into the POA CORBA::Object_ptr proxy_ref = proxy->_this(); // We send the reference to all the nodes... - Engines::Parallel_Component_var component_proxy = + Engines::Parallel_Component_var component_proxy = Engines::Parallel_Component::_narrow(InterfaceParallel_impl::_proxy); component_proxy->send_parallel_proxy_object(proxy_ref); @@ -883,13 +883,13 @@ Engines_Parallel_Component_i::setInputFileToService(const char* service_name, // into the proxy. for (int i = 0; i < getTotalNode(); i++) { if (i == getMyRank()) { - Parallel_Salome_file_i * servant = - new Parallel_Salome_file_i(CORBA::ORB::_duplicate(_orb), + Parallel_Salome_file_i * servant = + new Parallel_Salome_file_i(CORBA::ORB::_duplicate(_orb), proxy_ior.c_str(), i); - servant->copyGlobalContext(this); - - // We register the CORBA objet into the POA + servant->copyGlobalContext(this); + + // We register the CORBA object into the POA servant->POA_PaCO::InterfaceParallel::_this(); // Register the servant @@ -919,9 +919,9 @@ Engines_Parallel_Component_i::setInputFileToService(const char* service_name, return Engines::Salome_file::_narrow(proxy_ref); } -Engines::Salome_file_ptr -Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, - const char* Salome_file_name) +Engines::Salome_file_ptr +Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, + const char* Salome_file_name) { // Try to find the service, if it doesn't exist, we add it. _Service_file_map_it = _Output_Service_file_map.find(service_name); @@ -936,7 +936,7 @@ Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, _t_Salome_file_map * _map = _Output_Service_file_map[service_name]; _t_Proxy_Salome_file_map * _proxy_map = _Proxy_Output_Service_file_map[service_name]; _t_IOR_Proxy_Salome_file_map * _IOR_proxy_map = _IOR_Proxy_Output_Service_file_map[service_name]; - + pthread_mutex_lock(deploy_mutex); std::string proxy_ior; @@ -955,16 +955,16 @@ Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, if (getMyRank() == 0) { proxy = new Engines::Parallel_Salome_file_proxy_impl(CORBA::ORB::_duplicate(_orb), new paco_omni_fabrique()); - proxy->copyGlobalContext(this); + proxy->copyGlobalContext(this); PaCO::PacoTopology_t serveur_topo; serveur_topo.total = getTotalNode(); proxy->setTopology(serveur_topo); - // We register the CORBA objet into the POA + // We register the CORBA object into the POA CORBA::Object_ptr proxy_ref = proxy->_this(); // We send the reference to all the nodes... - Engines::Parallel_Component_var component_proxy = + Engines::Parallel_Component_var component_proxy = Engines::Parallel_Component::_narrow(InterfaceParallel_impl::_proxy); component_proxy->send_parallel_proxy_object(proxy_ref); @@ -982,13 +982,13 @@ Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, // into the proxy. for (int i = 0; i < getTotalNode(); i++) { if (i == getMyRank()) { - Parallel_Salome_file_i * servant = - new Parallel_Salome_file_i(CORBA::ORB::_duplicate(_orb), + Parallel_Salome_file_i * servant = + new Parallel_Salome_file_i(CORBA::ORB::_duplicate(_orb), proxy_ior.c_str(), i); - servant->copyGlobalContext(this); - - // We register the CORBA objet into the POA + servant->copyGlobalContext(this); + + // We register the CORBA object into the POA servant->POA_PaCO::InterfaceParallel::_this(); // Register the servant @@ -1018,9 +1018,9 @@ Engines_Parallel_Component_i::setOutputFileToService(const char* service_name, return Engines::Salome_file::_narrow(proxy_ref); } -Engines::Salome_file_ptr -Engines_Parallel_Component_i::getInputFileToService(const char* service_name, - const char* Salome_file_name) +Engines::Salome_file_ptr +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); @@ -1046,9 +1046,9 @@ Engines_Parallel_Component_i::getInputFileToService(const char* service_name, return Sfile->_this(); } -Engines::Salome_file_ptr -Engines_Parallel_Component_i::getOutputFileToService(const char* service_name, - const char* Salome_file_name) +Engines::Salome_file_ptr +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); @@ -1075,8 +1075,8 @@ Engines_Parallel_Component_i::getOutputFileToService(const char* service_name, } -void -Engines_Parallel_Component_i::checkInputFilesToService(const char* service_name) +void +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); @@ -1094,8 +1094,8 @@ Engines_Parallel_Component_i::checkInputFilesToService(const char* service_name) } } -void -Engines_Parallel_Component_i::checkOutputFilesToService(const char* service_name) +void +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); @@ -1115,21 +1115,21 @@ Engines_Parallel_Component_i::checkOutputFilesToService(const char* service_name } //============================================================================= -/*! +/*! * C++ method: Used by the Parallel Component to deploy a Parallel Salome_file - */ + */ //============================================================================= -void +void Engines_Parallel_Component_i::send_parallel_proxy_object(CORBA::Object_ptr proxy_ref) { _proxy = _orb->object_to_string(proxy_ref); } //============================================================================= -/*! +/*! * C++ method: Used by the Parallel Component to deploy a Parallel Salome_file - */ + */ //============================================================================= -void +void Engines_Parallel_Component_i::wait_parallel_object_proxy() { char * proxy = NULL; proxy = get_parallel_proxy_object(); @@ -1141,18 +1141,18 @@ Engines_Parallel_Component_i::wait_parallel_object_proxy() { } //============================================================================= -/*! +/*! * C++ method: Used by the Parallel Component to deploy a Parallel Salome_file - */ + */ //============================================================================= -char * +char * Engines_Parallel_Component_i::get_parallel_proxy_object() { return _proxy; } //============================================================================= -/*! +/*! * C++ method: used to configure the Salome_file into the runtime. * \param service_name name of the service that use this Salome_file * \param file_port_name name of the Salome_file @@ -1162,7 +1162,7 @@ Engines_Parallel_Component_i::get_parallel_proxy_object() { void Engines_Parallel_Component_i::configureSalome_file(std::string service_name, std::string file_port_name, - Engines::Parallel_Salome_file_proxy_impl * file) + Engines::Parallel_Salome_file_proxy_impl * file) { // By default this method does nothing } diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx index 076bdb70f..03d8b2fda 100755 --- a/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx +++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributePixMap.cxx @@ -59,7 +59,7 @@ void SALOMEDSTest::testAttributePixMap() //Check method GetPixMap CPPUNIT_ASSERT(_attr->GetPixMap() == pixmap); - //Check empty PixMap assigning and retreival + //Check empty PixMap assigning and retrieval _attr->SetPixMap(""); CPPUNIT_ASSERT(_attr->GetPixMap() == ""); diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx index 1e8bbed75..706058dab 100755 --- a/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx +++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributePythonObject.cxx @@ -60,7 +60,7 @@ void SALOMEDSTest::testAttributePythonObject() //Check method GetObject CPPUNIT_ASSERT(_attr->GetObject() == pyobj); - //Check setting and retreival of empty object + //Check setting and retrieval of empty object _attr->SetObject("", true); CPPUNIT_ASSERT(_attr->GetObject() == "" && _attr->IsScript()); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx index 6e5d07f2c..24f558ccb 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx @@ -480,7 +480,7 @@ bool SALOMEDSImpl_Study::Impl_SaveAs(const std::string& aStudyUrl, // Set "C" locale temporarily to avoid possible localization problems Kernel_Utils::Localizer loc; - // HDF File will be composed of differents part : + // HDF File will be composed of different part : // * For each ComponentDataType, all data created by the component // Information in data group hdf_group_datacomponent // * Study Structure -> Exactly what is contained in Document @@ -537,10 +537,10 @@ bool SALOMEDSImpl_Study::Impl_SaveAs(const std::string& aStudyUrl, } } } - else { - aDriver = aFactory->GetDriverByIOR(IOREngine); - } - aMapTypeDriver[aCompType] = aDriver; + else { + aDriver = aFactory->GetDriverByIOR(IOREngine); + } + aMapTypeDriver[aCompType] = aDriver; } catch(...) { _errorCode = "Can not restore information to resave it"; @@ -553,7 +553,7 @@ bool SALOMEDSImpl_Study::Impl_SaveAs(const std::string& aStudyUrl, URL(aStudyUrl); // To change for Save - // Do not have to do a new file but just a Open??? Rewrite all information after erasing evrything?? + // Do not have to do a new file but just a Open??? Rewrite all information after erasing everything?? hdf_file = new HDFfile((char*)aUrl.c_str()); hdf_file->CreateOnDisk(); @@ -573,8 +573,8 @@ bool SALOMEDSImpl_Study::Impl_SaveAs(const std::string& aStudyUrl, std::string componentDataType = sco.ComponentDataType(); std::string IOREngine; if (sco.ComponentIOR(IOREngine)) { - // Engine should be already in the map as it was to added before - SALOMEDSImpl_Driver* Engine = aMapTypeDriver[componentDataType]; + // Engine should be already in the map as it was to added before + SALOMEDSImpl_Driver* Engine = aMapTypeDriver[componentDataType]; if (Engine != NULL) { SALOMEDSImpl_TMPFile* aStream = NULL; long length = 0; @@ -2182,14 +2182,14 @@ bool SALOMEDSImpl_Study::DumpStudy(const std::string& thePath, isOk = false; std::stringstream sfp2; - + //Output the Python script generated by the component in the newly created file. if ( isMultiFile ) sfp2 << GetDumpStudyComment( aCompType.c_str() ) << std::endl; else sfp2 << GetComponentHeader( aCompType.c_str() ) << std::endl; sfp2 << aStream->Data(); - + if ( isMultiFile ) { //Create a file that will contain the component specific script std::fstream fp2; @@ -2202,24 +2202,24 @@ bool SALOMEDSImpl_Study::DumpStudy(const std::string& thePath, aScriptName += theBaseName; aScriptName += "_"; aScriptName += aCompType; - + aFileName += aScriptName+ std::string(".py"); aSeqOfFileNames.push_back(aFileName); - + fp2.open(aFileName.c_str(), std::ios::out); - + #ifdef WIN32 isOpened = fp2.is_open(); #else isOpened = fp2.rdbuf()->is_open(); #endif - + if(!isOpened) { _errorCode = std::string("Can't create a file ")+aFileName; SALOMEDSImpl_Tool::RemoveTemporaryFiles(thePath, aSeqOfFileNames, false); return false; } - + // replace '\t' symbols fp2 << replace_tabs( sfp2.str() ); @@ -2245,7 +2245,7 @@ bool SALOMEDSImpl_Study::DumpStudy(const std::string& thePath, // replace '\t' symbols fp << replace_tabs( sfp.str() ); - + fp.close(); return isOk; @@ -2926,7 +2926,7 @@ bool SALOMEDSImpl_Study::removeSO_Notification (const SALOMEDSImpl_SObject& theS pass the mofification reason */ //============================================================================ -bool SALOMEDSImpl_Study::modifySO_Notification (const SALOMEDSImpl_SObject& theSObject, int reason) +bool SALOMEDSImpl_Study::modifySO_Notification (const SALOMEDSImpl_SObject& theSObject, int reason) { if(_notifier) return _notifier->modifySO_Notification(theSObject, reason); @@ -2939,7 +2939,7 @@ bool SALOMEDSImpl_Study::modifySO_Notification (const SALOMEDSImpl_SObject& theS * Purpose : register a notifier */ //============================================================================ -void SALOMEDSImpl_Study::setNotifier(SALOMEDSImpl_AbstractCallback* notifier) +void SALOMEDSImpl_Study::setNotifier(SALOMEDSImpl_AbstractCallback* notifier) { _notifier=notifier; } @@ -3195,4 +3195,3 @@ void ReadNoteBookVariables(SALOMEDSImpl_Study* theStudy, HDFgroup* theGroup) theGroup->CloseOnDisk(); } - -- 2.39.2