From: eap Date: Mon, 20 Nov 2017 11:20:32 +0000 (+0300) Subject: Fix typos by Kunda X-Git-Tag: V9_0_0~3^2~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97c540aef8c8b4a831e01218b620fe1ff8467ffa;p=modules%2Fkernel.git Fix typos by Kunda http://www.salome-platform.org/forum/forum_9/799474332 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a1e000f2d..a11858e04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_PACO_PARALLEL) # Required prerequisites # Find "big" prerequisites first - they reference themselves many others -# -> this can help finding the smaller prerequisites and detect conficts. +# -> this can help finding the smaller prerequisites and detect conflicts. # ======================= # Exception: LibBatch is optional but is loaded first, as it can diff --git a/README b/README index f2b0c2db7..43b4dd532 100644 --- a/README +++ b/README @@ -27,7 +27,7 @@ Installation Pre-requisites -------------- -SALOME platform relies on a set of third-party softwares; some of them are needed +SALOME platform relies on a set of third-party software; some of them are needed at build time only, while other ones are needed in runtime also. For more information about the pre-requisites please visit SALOME platform web diff --git a/SalomeKERNELConfig.cmake.in b/SalomeKERNELConfig.cmake.in index 463578ff9..ce4322712 100644 --- a/SalomeKERNELConfig.cmake.in +++ b/SalomeKERNELConfig.cmake.in @@ -1,6 +1,6 @@ # - Config file for the @PROJECT_NAME@ package # It defines the following variables. -# Specific to the pacakge @PROJECT_NAME@ itself: +# Specific to the package @PROJECT_NAME@ itself: # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # # Other stuff specific to this package: diff --git a/bin/appliskel/salome_tester/salome_test_driver.py b/bin/appliskel/salome_tester/salome_test_driver.py index 478d012da..c167e97f6 100644 --- a/bin/appliskel/salome_tester/salome_test_driver.py +++ b/bin/appliskel/salome_tester/salome_test_driver.py @@ -54,7 +54,7 @@ if __name__ == "__main__": setOmniOrbUserPath() # Set timeout handler - print "Test timeout explicitely set to: %s seconds"%timeout_delay + print "Test timeout explicitly set to: %s seconds"%timeout_delay timeout_sec = abs(int(timeout_delay)-10) if sys.platform == 'win32': from threading import Timer diff --git a/bin/appliskel/salome_tester/salome_test_driver_gui.py b/bin/appliskel/salome_tester/salome_test_driver_gui.py index 7ef53d33f..1e99d312d 100644 --- a/bin/appliskel/salome_tester/salome_test_driver_gui.py +++ b/bin/appliskel/salome_tester/salome_test_driver_gui.py @@ -51,7 +51,7 @@ if __name__ == "__main__": setOmniOrbUserPath() # Set timeout handler - print "Test timeout explicitely set to: %s seconds"%timeout_delay + print "Test timeout explicitly set to: %s seconds"%timeout_delay timeout_sec = abs(int(timeout_delay)-10) if sys.platform == 'win32': from threading import Timer diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index fa8953b7c..01d1eb39a 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -217,9 +217,9 @@ def shutdownMyPort(port, cleanup=True): sys.exit(0) # see (1) pass # (1) If --shutdown-servers option is set to 1, session close procedure is -# called twice: first explicitely by salome command, second by automatic +# called twice: first explicitly by salome command, second by automatic # atexit to handle Ctrl-C. During second call, LCC does not exist anymore and -# a RuntimeError is raised; we explicitely exit this function with code 0 to +# a RuntimeError is raised; we explicitly exit this function with code 0 to # prevent parent thread from crashing. def __killMyPort(port, filedict): diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 57c492797..06b9645d8 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -767,7 +767,7 @@ def CreateOptionParser (theAdditionalOptions=None, exeName=None): # wake up session help_str = "Wake up a previously closed session. " help_str += "The session object is found in the naming service pointed by the variable OMNIORB_CONFIG. " - help_str += "If this variable is not setted, the last configuration is taken. " + help_str += "If this variable is not set, the last configuration is taken. " o_wake_up = optparse.Option("--wake-up-session", action="store_true", dest="wake_up_session", default=False, diff --git a/bin/runSalome.py b/bin/runSalome.py index 243ec39c1..e6e797639 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -41,7 +41,7 @@ from killSalome import killAllPorts def killLocalPort(): """ - kill servers from a previous SALOME exection, if needed, + kill servers from a previous SALOME execution, if needed, on the CORBA port given in args of runSalome """ @@ -56,7 +56,7 @@ def killLocalPort(): def givenPortKill(port): """ - kill servers from a previous SALOME exection, if needed, + kill servers from a previous SALOME execution, if needed, on the same CORBA port """ @@ -587,7 +587,7 @@ def startSalome(args, modules_list, modules_root_dir): # session.GetInterface() # - # additionnal external python interpreters + # additional external python interpreters # nbaddi=0 @@ -856,7 +856,7 @@ def runSalome(): test = args['gui'] and args['session_gui'] test = test or args['wake_up_session'] # -- - # The next test covers the --pinter option or var PYTHONINSPECT setted + # The next test covers the --pinter option or if var PYTHONINSPECT is set # -- test = test and not os.environ.get('PYTHONINSPECT') # -- diff --git a/bin/runSession.py b/bin/runSession.py index 761e5d023..8045a62e6 100644 --- a/bin/runSession.py +++ b/bin/runSession.py @@ -159,7 +159,7 @@ User "myself" connects to remotemachine to run the script concatenate.py in os.environ['NSPORT'] = port os.environ['NSHOST'] = host - # determine running mode, taht is either 'local' or 'remote' + # determine running mode, that is either 'local' or 'remote' here = getShortHostName() mode = "local" if host != here and host != "localhost" and host != "no_host": diff --git a/bin/salomeContext.py b/bin/salomeContext.py index f3f3ccc01..b67209092 100644 --- a/bin/salomeContext.py +++ b/bin/salomeContext.py @@ -84,7 +84,7 @@ class SalomeContext: """ def __init__(self, configFileNames=0): self.getLogger().setLevel(logging.INFO) - #it could be None explicitely (if user use multiples setVariable...for standalone) + #it could be None explicitly (if user use multiples setVariable...for standalone) if configFileNames is None: return configFileNames = configFileNames or [] @@ -231,7 +231,7 @@ class SalomeContext: """ Run SALOME! - Args consist in a mandatory command followed by optionnal parameters. + Args consist in a mandatory command followed by optional parameters. See usage for details on commands. """ def _startSalome(self, args): diff --git a/doc/salome/examples/example19 b/doc/salome/examples/example19 index 4cf37eb34..db65c7d92 100644 --- a/doc/salome/examples/example19 +++ b/doc/salome/examples/example19 @@ -237,7 +237,7 @@ Divz = Div.Port('z') # This DataFlow is "executable" : all pending Ports are defined with Datas print myGraph.IsExecutable() -# Starts only execution of that DataFlow and gets control immediatly +# Starts only execution of that DataFlow and gets control immediately print myGraph.Run() # That DataFlow is running ==> 0 (false) diff --git a/doc/salome/install.dox b/doc/salome/install.dox index ce7a819be..f145e4aa7 100644 --- a/doc/salome/install.dox +++ b/doc/salome/install.dox @@ -18,11 +18,11 @@ You'll find here generic instructions for installing the SALOME platform. \section S1_install Quick Overview -First of all, you have to check (or install if needed) the dependant +First of all, you have to check (or install if needed) the dependent software programs on your system. These programs are: - common development tools as gcc, CMake tool. -- third party softwares used in %SALOME building or runtime process +- third party software used in %SALOME building or runtime process (python, OCC, VTK, ...) Further details can be found in sections \ref S2_install and \ref S3_install. @@ -49,7 +49,7 @@ Then, the %SALOME components GEOM, MED, VISU, ... can be installed with a similar procedure (cf. \ref S6_install). Eventually, the platform can be run by executing the shell script -%runSalome (cf. \ref S7_install). Here, somme additionnal variables have to be set +%runSalome (cf. \ref S7_install). Here, somme additional variables have to be set to describe the %SALOME runtime configuration (_ROOT_DIR, OMNIORB_CONFIG) @@ -58,7 +58,7 @@ The following provides you with specific instructions for each step. \section S2_install System configuration -%SALOME is compiled and tested on differents platforms with native packages: +%SALOME is compiled and tested on different platforms with native packages: - Debian sarge - Mandrake 10.1 - ... @@ -72,11 +72,11 @@ for building process: remarks: - This is the minimum level of CMake, if you need - to compile all the third party softwares (included OpenCascade 5.2.x). + to compile all the third party software (included OpenCascade 5.2.x). \section S3_install Third-party dependencies -The %SALOME platform relies on a set of third-party softwares. The +The %SALOME platform relies on a set of third-party software. The current version depends on the following list (versions given here are from Debian Sarge, except OpenCascade, VTK and MED, which are not Debian packages): @@ -100,7 +100,7 @@ And, in order to build the documentation: - graphviz-2.2.1 -Additionnal software may be installed for optional features: +Additional software may be installed for optional features: - netgen4.3 + patch - tix8.1.4 @@ -116,7 +116,7 @@ Additionnal software may be installed for optional features: - See doc/configuration_examples/* -In the following, we assume that all the third-party softwares are +In the following, we assume that all the third-party software are installed in the same root directory, named /prerequis. Then, your file system should probably look like: @@ -135,7 +135,7 @@ process and runtime. The shell file prerequis.sh, embedded in the KERNEL source package, provides a template for setting those variables. In this example, all the -softwares are supposed to be installed in the same root directory, +software are supposed to be installed in the same root directory, named here INSTALLROOT. Copy the prerequis.sh in a working directory and adjust the settings @@ -239,7 +239,7 @@ For example, installing the component SMESH needs the previous installation of the KERNEL component, and then the GEOM and MED components. The building process uses the variables _ROOT_DIR to -localize the dependant components. The variables must be set to the +localize the dependent components. The variables must be set to the install path directory of the components (ex: KERNEL_ROOT_DIR=). @@ -257,7 +257,7 @@ The following explains the general principles. To run the %SALOME platform, the procedure is: -- set the shell environment to get access to third-party softwares: +- set the shell environment to get access to third-party software: \code $ source prerequis.sh \endcode @@ -291,7 +291,7 @@ For convenience or customization, we suggest the following organisation: - choose and create a root directory for the %SALOME platform, say . -- install the third-party softwares in a sub-directory "prerequis" +- install the third-party software in a sub-directory "prerequis" - install the %SALOME components in a sub-directory "SALOME2" diff --git a/doc/salome/kernel_resources.dox b/doc/salome/kernel_resources.dox index 01d39bcfb..2223d815e 100644 --- a/doc/salome/kernel_resources.dox +++ b/doc/salome/kernel_resources.dox @@ -37,7 +37,7 @@ When the code is assumed to be valid, the release mode optimizes execution, in terms of speed, memory, and display only user level messages. -But, some informations must always be displayed in both +But, some information must always be displayed in both modes: especially messages concerning environment or internal errors, with version identification. When an end user is confronted to such a message, he may refer @@ -73,7 +73,7 @@ given at %SALOME start, writes the messages on the standard output, a file, or send them via CORBA, in case of a multi machine configuration. -Three informations are systematically added in front of +Three information are systematically added in front of the information displayed: - the %thread number from which the message come from; - the name of the source file in which the macros is set; @@ -84,7 +84,7 @@ the information displayed: - INFOS_COMPILATION\n The C++ macro INFOS_COMPILATION writes on the trace - buffer pool informations about the compiling process: + buffer pool information about the compiling process: - the name of the compiler : g++, KCC, CC, pgCC; - the date and the time of the compiling processing process. . diff --git a/doc/salome/kernel_services.dox b/doc/salome/kernel_services.dox index d68ced648..e45374a3c 100644 --- a/doc/salome/kernel_services.dox +++ b/doc/salome/kernel_services.dox @@ -40,7 +40,7 @@ systematically in your scripts, to allow them to work in all configurations. See \ref kernel_salome for a short description of most useful variables and functions. -\subsection subsection12 Container and component instanciation +\subsection subsection12 Container and component instantiation See SALOME_LifeCycleCORBA for the C++ interface (Python interface obtained with SWIG is very similar). @@ -144,7 +144,7 @@ SalomeAppEngine.object See SALOME_FileTransferCORBA for the C++ interface (Python interface obtained with SWIG is very similar). -The following example shows how to tranfer a file from a remote host to the +The following example shows how to transfer a file from a remote host to the client computer. Remote hostname is 'cli76cc', we would like to copy 'tkcvs_8_0_3.tar.gz' from remote to local computer. %A full pathname is required. %A container is created on remote computer if it does not exist, diff --git a/doc/salome/main.dox b/doc/salome/main.dox index 40811aacc..e89060e34 100644 --- a/doc/salome/main.dox +++ b/doc/salome/main.dox @@ -54,7 +54,7 @@ releases are identified by a CVS tag. \section S5_main SALOME programming model -You will find in the next pages informations about +You will find in the next pages information about specific points of %SALOME Kernel : - \subpage kernel_salome diff --git a/doc/salome/python_doc_api.dox b/doc/salome/python_doc_api.dox index d013f7af1..1a51120c1 100644 --- a/doc/salome/python_doc_api.dox +++ b/doc/salome/python_doc_api.dox @@ -13,7 +13,7 @@ included in source python files. - enumerate - Emulates a C-like enum for python - uiexception - %Exception for user error management - datamodeler - Helper for modeling user data - - diclookup - Smart dictionnary with key/value lookup + - diclookup - Smart dictionary with key/value lookup - service - Helper for using %SALOME kernel services - studyedit - Study editor - unittester - Run very basic unit tests diff --git a/doc/salome/python_doc_compl.dox b/doc/salome/python_doc_compl.dox index 475f8ecff..46c9b982b 100644 --- a/doc/salome/python_doc_compl.dox +++ b/doc/salome/python_doc_compl.dox @@ -43,7 +43,7 @@ The motivations of this objective are twice: modules coming from different %SALOME modules. Today, the developper of a module has to take care of the names used in other modules to choose a name. -- Integrate in %SALOME some python modules initialy developed in the +- Integrate in %SALOME some python modules initially developed in the context of domain specific %SALOME applications (%SALOME-MECA, %SALOME-CFD, OPENTURN, PANTHERE) and whose source files are organized in a packaged python structure. @@ -76,7 +76,7 @@ and all other stuff should be imported and work as before). To reach this target, we have to face two problems: - %A naming conflict with the instruction import salome. The result - is unpredictible because of the existance in the sys.path of + is unpredictible because of the existence in the sys.path of both a file salome.py and a package \b salome. - The dispatching of salome.* sub-packages in the different %SALOME modules. @@ -184,7 +184,7 @@ module are leaft untouched but the file salome.py. One special point for the documentation: -- The documentation of the python package API is writen in HTML +- The documentation of the python package API is written in HTML and generated form the source code with doxygen. - The *.dox (doxygen file) source files are located in the directory /doc/salome. diff --git a/doc/salome/salome_application.dox b/doc/salome/salome_application.dox index 92dc5fb5c..c909d4e3b 100644 --- a/doc/salome/salome_application.dox +++ b/doc/salome/salome_application.dox @@ -17,7 +17,7 @@ You can choose one of the following approaches: %A %SALOME user can define several %SALOME applications. These applications are runnable from the same user account. These applications may share the same -KERNEL and modules. Thus, the application configuration is independant of +KERNEL and modules. Thus, the application configuration is independent of KERNEL and must not be put in KERNEL_ROOT_DIR. Furthermore, prerequisites may not be the same on all the applications. diff --git a/doc/salome/unittests.dox b/doc/salome/unittests.dox index d9fb7bcc2..101183569 100644 --- a/doc/salome/unittests.dox +++ b/doc/salome/unittests.dox @@ -65,7 +65,7 @@ the unit tests. Basic CORBA services - Logger :\n - %A CORBA %server that collects the trace messages from differents CORBA + %A CORBA %server that collects the trace messages from different CORBA process. - SALOMETraceCollector :\n @@ -102,7 +102,7 @@ the unit tests. library included in container %server - Notification :\n - library included in differents servers (container) + library included in different servers (container) - NOTIFICATION_SWIG diff --git a/idl/DSC_Engines.idl b/idl/DSC_Engines.idl index 503aceaa3..0e2431c0a 100644 --- a/idl/DSC_Engines.idl +++ b/idl/DSC_Engines.idl @@ -51,7 +51,7 @@ module Engines { of the same interface type. When the connection is done, a component can use the "uses port" to use the interface provided by the "provides port". - The interface DSC implements the component interface that containes the operations that are needed + The interface DSC implements the component interface that contains the operations that are needed to manage declarations into a component and connections between ports. These operations are logicaly divided in two parts : diff --git a/idl/SALOMEDS.idl b/idl/SALOMEDS.idl index 3303ac682..8e8f4f218 100644 --- a/idl/SALOMEDS.idl +++ b/idl/SALOMEDS.idl @@ -758,7 +758,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin Returns True if at this moment there is a command under execution. */ boolean HasOpenCommand(); -/*! \brief Cancelation of the command +/*! \brief Cancellation of the command Cancels all actions declared within the command. @@ -904,7 +904,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin /*! \brief Saving the study in a specified HDF 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 aStudy The study which will be saved \param theMultiFile If this parameter is True the study will be saved in several files. @@ -917,7 +917,7 @@ Searches for a definite %SObject with a definite GUID and returns True if it fin Saves the study in a specified ASCII 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 aStudy The study which will be saved \param theMultiFile If this parameter is True the study will be saved in several files. */ @@ -1375,7 +1375,7 @@ can be called by any component and which provide the following functionality:
  • publishing in the study of the objects created by a definite component
  • saving/loading of the data created by a definite component. These methods are called by the StudyManager when loading/saving a study containing the data created by a definite component. -
  • transforming of the transient references into persistant references (or vice versa) of the SObjects when saving (or loading) a study +
  • transforming of the transient references into persistent references (or vice versa) of the SObjects when saving (or loading) a study
  • copy/paste common functionality. These methods can be called by any component in order to copy/paste its object created in the study
diff --git a/idl/SALOMEDS_Attributes.idl b/idl/SALOMEDS_Attributes.idl index ff66d52e4..5e1915572 100644 --- a/idl/SALOMEDS_Attributes.idl +++ b/idl/SALOMEDS_Attributes.idl @@ -657,7 +657,7 @@ module SALOMEDS \brief Tree node attribute. By specifying the tree node attributes for the SObjects it is possible to - create internal auxillary %object tree with its own structure and identifier. + create internal auxiliary %object tree with its own structure and identifier. Since each such tree is specfied by the unique identifier, it is possible to create as many trees as it is required. @@ -829,7 +829,7 @@ module SALOMEDS \brief Attribute storing GUID. This attribute can be used to store arbitrary GUID. Attribute allowing to store GUID. - In contrast to any other atribute (e.g. AttributeLocalID), it is possible to + In contrast to any other attribute (e.g. AttributeLocalID), it is possible to define as many GUID attributes for the same SObject as it is required provided that they have different GUID values. @@ -1068,7 +1068,7 @@ module SALOMEDS */ void RemoveValue(in long row, in long column) raises(IncorrectIndex); /*! - \brief Sets the maximum number of colums in the table. + \brief Sets the maximum number of columns in the table. If new number of columns is less than the current one, the table is truncated (extra columns are removed). @@ -1677,7 +1677,7 @@ module SALOMEDS /*! \brief Python %object attribute - This attribute is used to store pyton objects as a sequence of characters. + This attribute is used to store python objects as a sequence of characters. */ //========================================================================== interface AttributePythonObject : GenericAttribute diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl index 1e6df7625..930835584 100644 --- a/idl/SALOME_Component.idl +++ b/idl/SALOME_Component.idl @@ -80,7 +80,7 @@ module Engines try to make a Python import of COMPONENT, then a lib open of libCOMPONENTEngine.so \param reason in case of error (return false) a string explaining the error - \return true if load successfull or already done, false otherwise + \return true if load successful or already done, false otherwise */ boolean load_component_Library(in string componentName, out string reason); @@ -102,7 +102,7 @@ module Engines This simply loads the service in the current container by importing the corresponding Python module. Warning: no internal registration is done, so it is up to the caller to - manage the various instanciation. + manage the various instantiation. \param serviceName Name of the service >0 otherwise (== study id) @@ -369,7 +369,7 @@ module Engines \return CORBA Ref of the requested file. - \exception contains informations of what if the component cannot + \exception contains information of what if the component cannot sends the file's reference. */ Engines::Salome_file getInputFileToService(in string service_name, @@ -389,7 +389,7 @@ module Engines \param service_name service's name. - \exception contains informations about files that are not in a good state. + \exception contains information about files that are not in a good state. */ void checkInputFilesToService(in string service_name) raises(SALOME::SALOME_Exception); @@ -415,7 +415,7 @@ module Engines \return CORBA Ref of the requested file. - \exception contains informations of what if the component cannot + \exception contains information of what if the component cannot sends the file's reference. */ Engines::Salome_file getOutputFileToService(in string service_name, @@ -435,7 +435,7 @@ module Engines \param service_name service's name. - \exception contains informations about files that are not in a good state. + \exception contains information about files that are not in a good state. */ void checkOutputFilesToService(in string service_name) raises(SALOME::SALOME_Exception); @@ -589,7 +589,7 @@ module Engines \param hdf5_file name (with path) of the hdf5_file. - \exception contains informations of errors if the loading doesn't succeed. + \exception contains information of errors if the loading doesn't succeed. */ void load(in string hdf5_file) raises (SALOME::SALOME_Exception); @@ -598,7 +598,7 @@ module Engines \param hdf5_file name (with path) of the hdf5_file. - \exception contains informations of errors if the save doesn't succeed. + \exception contains information of errors if the save doesn't succeed. */ void save(in string hdf5_file) raises (SALOME::SALOME_Exception); @@ -609,7 +609,7 @@ module Engines \param hdf5_file name (with path) of the hdf5_file. - \exception contains informations of errors if the save doesn't succeed. + \exception contains information of errors if the save doesn't succeed. */ void save_all(in string hdf5_file) raises (SALOME::SALOME_Exception); diff --git a/idl/SALOME_ContainerManager.idl b/idl/SALOME_ContainerManager.idl index 68657c71a..6b350082b 100644 --- a/idl/SALOME_ContainerManager.idl +++ b/idl/SALOME_ContainerManager.idl @@ -60,7 +60,7 @@ struct ContainerParameters long nb_proc; //! if true start a MPI container boolean isMPI; - //! PaCO specific informations + //! PaCO specific information string parallelLib; //! Parameters to choose a resource diff --git a/idl/SALOME_Launcher.idl b/idl/SALOME_Launcher.idl index fe3738a5d..d68a7cea7 100644 --- a/idl/SALOME_Launcher.idl +++ b/idl/SALOME_Launcher.idl @@ -94,16 +94,16 @@ struct JobParameters this directory. A change directory toward this working directory is done by the batch system before running the job. If not specified (empty string), the launcher will use the working - directory of the chosen ressource and if this is also an empty string + directory of the chosen resource and if this is also an empty string the value used will be $HOME/Batch/workdir_"date" where $HOME is the - value of the environment variable on the remote ressource and "date" is + value of the environment variable on the remote resource and "date" is the current date. */ string work_directory; //! Prefix to be applied to #in_files. /*! It can be used to specify where to find the local input files. - It's optionnal if you specify the absolute path name of input files. + It's optional if you specify the absolute path name of input files. */ string local_directory; @@ -122,8 +122,8 @@ struct JobParameters */ string maximum_duration; - //! Specifies the rules to choose the ressource where to execute the job. - /*! The additionnal two following parameters MUST be specified explicitly, + //! Specifies the rules to choose the resource where to execute the job. + /*! The additional two following parameters MUST be specified explicitly, because they are not provided by the resource definition: - mem_mb -> Memory expressed in megabytes. - nb_proc -> Number of Processors. diff --git a/idl/SALOME_PyNode.idl b/idl/SALOME_PyNode.idl index 0e1b77d9a..19ff0f2cb 100644 --- a/idl/SALOME_PyNode.idl +++ b/idl/SALOME_PyNode.idl @@ -47,7 +47,7 @@ module Engines void defineNewCustomVar(in string varName, in pickledArgs valueOfVar) raises (SALOME::SALOME_Exception); /*! - This methode executes the python code in \a codeStr and can append/remove symboles in context to make them available or not for future call of execute on this. + This method executes the python code in \a codeStr and can append/remove symboles in context to make them available or not for future call of execute on this. \param [in] codeStr - the python code (without statement) to be executed, that can modify the context initialized at initialization. */ void executeAnotherPieceOfCode(in string codeStr) raises (SALOME::SALOME_Exception); diff --git a/idl/SALOME_Registry.idl b/idl/SALOME_Registry.idl index 06aea0485..dd2887d54 100644 --- a/idl/SALOME_Registry.idl +++ b/idl/SALOME_Registry.idl @@ -32,7 +32,7 @@ */ module Registry { - //! a struct to collect informations about servers (processes) + //! a struct to collect information about servers (processes) struct Infos { string name; @@ -50,7 +50,7 @@ module Registry string ior; // client }; - //! a list of informations + //! a list of information typedef sequence AllInfos; /*! \brief interface to use %SALOME registry @@ -67,7 +67,7 @@ module Registry void remove ( in unsigned long id ) ; //! Get the size of the registry unsigned long size() ; - //! Get all informations from registry + //! Get all information from registry AllInfos getall () ; //! Get history information from registry AllInfos history () ; diff --git a/idl/SALOME_ResourcesManager.idl b/idl/SALOME_ResourcesManager.idl index 4884233bd..4dafdf76d 100644 --- a/idl/SALOME_ResourcesManager.idl +++ b/idl/SALOME_ResourcesManager.idl @@ -41,8 +41,8 @@ typedef sequence IntegerList; struct ResourceParameters { //! resource name - manual selection - /*! If a name is provided, the ressource will be imposed. - If the name is an empty string, the ressource will be chosen to match + /*! If a name is provided, the resource will be imposed. + If the name is an empty string, the resource will be chosen to match the other parameters. */ string name; @@ -73,14 +73,14 @@ struct ResourceParameters The parameter specifies the maximum memory value that could be allocated for executing the job. This takes into account not only the data that could be loaded by the batch process but also the linked dynamic library. - A possible problem, for exemple in the case where you use the ssh + A possible problem, for example in the case where you use the ssh emulation of a batch system, is to get an error message as below when libBatch tries to run the ssh command: \verbatim /usr/bin/ssh: error while loading shared libraries: libcrypto.so.0.9.8: failed to map segment from shared object: Cannot allocate memory \endverbatim - In this exemple, the mem_mb was set to 1MB, value that is not + In this example, the mem_mb was set to 1MB, value that is not sufficient to load the dynamic libraries linked to the ssh executable (libcrypto.so in the error message). So, even in the case of a simple test shell script, you should @@ -191,7 +191,7 @@ interface ResourcesManager string getMachineFile(in string resource_name, in long nb_procs, in string parallelLib) raises (SALOME::SALOME_Exception); - //! Return list of resources available (regarding containt of CatalogResources.xml). And for each resource the number of proc available of it. + //! Return list of resources available (regarding content of CatalogResources.xml). And for each resource the number of proc available of it. void ListAllAvailableResources(out ResourceList machines, out IntegerList nbProcsOfMachines) raises (SALOME::SALOME_Exception); }; diff --git a/resources/channel.cfg b/resources/channel.cfg index afe59a75c..a6a92d417 100755 --- a/resources/channel.cfg +++ b/resources/channel.cfg @@ -152,7 +152,7 @@ NumAdminThreads 2 # notifd may split the filter evaluation processing in two stages. In # this case, a second thread pool is used for evaluating proxy-level -# filters. The size of the pool is controled by the following +# filters. The size of the pool is controlled by the following NumProxyThreads 0 diff --git a/salome_adm/unix/DEPRECATED/Doxyfile b/salome_adm/unix/DEPRECATED/Doxyfile index 161a7285d..ee9c57bb4 100644 --- a/salome_adm/unix/DEPRECATED/Doxyfile +++ b/salome_adm/unix/DEPRECATED/Doxyfile @@ -157,7 +157,7 @@ STRIP_CODE_COMMENTS = YES # file names in lower case letters. If set to YES upper case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows -# users are adviced to set this option to NO. +# users are advised to set this option to NO. CASE_SENSE_NAMES = YES diff --git a/salome_adm/unix/DEPRECATED/make_omniorb.in b/salome_adm/unix/DEPRECATED/make_omniorb.in index c793df7cd..7f4736ce9 100644 --- a/salome_adm/unix/DEPRECATED/make_omniorb.in +++ b/salome_adm/unix/DEPRECATED/make_omniorb.in @@ -32,7 +32,7 @@ # Client and server object are the same with omniorb # There are one header file and one source file generate #IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ)) -# dependancies between idl and it's generated files +# dependencies between idl and its generated files # %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< diff --git a/salome_adm/unix/config_files/DEPRECATED/config.guess b/salome_adm/unix/config_files/DEPRECATED/config.guess index 0ce538bb8..6e0d66cdc 100755 --- a/salome_adm/unix/config_files/DEPRECATED/config.guess +++ b/salome_adm/unix/config_files/DEPRECATED/config.guess @@ -709,7 +709,7 @@ main(argc, argv) #if defined(__GLIBC__) printf("%s %s\n", __libc_version, __libc_release); #else - printf("unkown\n"); + printf("unknown\n"); #endif return 0; } diff --git a/salome_adm/unix/config_files/DEPRECATED/ltmain.sh b/salome_adm/unix/config_files/DEPRECATED/ltmain.sh index 251394b4d..700bdeb56 100644 --- a/salome_adm/unix/config_files/DEPRECATED/ltmain.sh +++ b/salome_adm/unix/config_files/DEPRECATED/ltmain.sh @@ -1887,8 +1887,8 @@ EOF fi done else - # Error occured in the first compile. Let's try to salvage the situation: - # Compile a seperate program for each library. + # Error occurred in the first compile. Let's try to salvage the situation: + # Compile a separate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. @@ -3726,7 +3726,7 @@ libdir='$install_libdir'\ eval "export $shlibpath_var" fi - # Restore saved enviroment variables + # Restore saved environment variables if test "${save_LC_ALL+set}" = set; then LC_ALL="$save_LC_ALL"; export LC_ALL fi diff --git a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 index bda90d46c..8275f5dae 100644 --- a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 +++ b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 @@ -150,7 +150,7 @@ dnl MACHINE="PCLINUX" fi done -dnl use gcc option -MG : asume unknown file will be construct later +dnl use gcc option -MG : assume unknown file will be construct later rm -f conftest.d conftest.err ${DEPCC} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err if test -f conftest.u ; then @@ -191,7 +191,7 @@ dnl use gcc option -MG : asume unknown file will be construct later fi done -dnl use g++ option -MG : asume unknown file will be construct later +dnl use g++ option -MG : assume unknown file will be construct later rm -f conftest.d conftest.err ${DEPCXX} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err if test -f conftest.u ; then diff --git a/salome_adm/unix/config_files/ac_cxx_option.m4 b/salome_adm/unix/config_files/ac_cxx_option.m4 index 83c01dd39..b46b8fc21 100644 --- a/salome_adm/unix/config_files/ac_cxx_option.m4 +++ b/salome_adm/unix/config_files/ac_cxx_option.m4 @@ -25,7 +25,7 @@ dnl Check options for C++ compiler dnl @author Bernard Secher - 15/01/2004 dnl AC_DEFUN([AC_CXX_OPTION], [ - AC_MSG_CHECKING(wether $CXX accepts $1) + AC_MSG_CHECKING(whether $CXX accepts $1) cat > conftest.cxx < 0 if open OK. */ //============================================================================= @@ -144,7 +144,7 @@ Engines::fileBlock* fileTransfer_i::getBlock(CORBA::Long fileId) * * CORBA method: try to open the file. If the file is writable, * return a positive integer else return 0; - * \param fileName path to the file to be transfered + * \param fileName path to the file to be transferred * \return fileId = positive integer > 0 if open OK. */ CORBA::Long fileTransfer_i::openW(const char* fileName) diff --git a/src/Container/Salome_file_i.cxx b/src/Container/Salome_file_i.cxx index 29c234936..6a089f14b 100644 --- a/src/Container/Salome_file_i.cxx +++ b/src/Container/Salome_file_i.cxx @@ -373,7 +373,7 @@ Salome_file_i::save_all(const char* hdf5_file) { } // For each file we create two groups - // First group contains file's informations + // First group contains file's information // Second group contains the file // At the end we create a group and a dataset containing the names // of all the files. @@ -527,7 +527,7 @@ Salome_file_i::setLocalFile(const char* comp_file_name) if(fopen(comp_file_name,"rb") != NULL) status = "ok"; - // Adding file with is informations + // Adding file with its information Engines::file infos; infos.file_name = CORBA::string_dup(file_name.c_str()); infos.path = CORBA::string_dup(path.c_str()); @@ -585,7 +585,7 @@ Salome_file_i::setDistributedFile(const char* comp_file_name) throw SALOME::SALOME_Exception(es); } - // Adding file with his informations + // Adding file with its information Engines::file infos; infos.file_name = CORBA::string_dup(file_name.c_str()); infos.path = CORBA::string_dup(path.c_str()); @@ -962,7 +962,7 @@ Salome_file_i::getSalome_fileState() /*! * CORBA method: try to open the file given. If the file is readable, return * a positive integer else return 0; - * \param fileName file name to be transfered + * \param fileName file name to be transferred * \return fileId = positive integer > 0 if open OK. */ //============================================================================= diff --git a/src/Container/Salome_file_i.hxx b/src/Container/Salome_file_i.hxx index c6f1b84f1..c5f1617f7 100644 --- a/src/Container/Salome_file_i.hxx +++ b/src/Container/Salome_file_i.hxx @@ -67,7 +67,7 @@ class CONTAINER_EXPORT Salome_file_i: virtual void removeFile(const char* file_name); virtual void removeFiles(); - // Informations methods: + // Information methods: virtual void setContainer(Engines::Container_ptr container); virtual Engines::files* getFilesInfos(); virtual Engines::file* getFileInfos(const char* file_name); @@ -89,7 +89,7 @@ class CONTAINER_EXPORT Salome_file_i: // a fd descriptor (FILE*) open on the file. typedef std::map _t_fileAccess; - // Contains the informations of the files managed by the Salome_file. + // Contains the information of the files managed by the Salome_file. typedef std::map _t_fileManaged; // Contains the CORBA reference for each distributed file managed. diff --git a/src/DSC/DSC_User/Datastream/CMakeLists.txt b/src/DSC/DSC_User/Datastream/CMakeLists.txt index d390c9f28..8ce0ffaba 100755 --- a/src/DSC/DSC_User/Datastream/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/CMakeLists.txt @@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES( ADD_SUBDIRECTORY(Palm) ADD_SUBDIRECTORY(Calcium) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS SalomePalm SalomeCalcium diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc index 71b44e112..3f5e0e1a1 100644 --- a/src/HDFPersist/HDFfile.cc +++ b/src/HDFPersist/HDFfile.cc @@ -79,7 +79,7 @@ void HDFfile::OpenOnDisk(hdf_access_mode access_mode) break; default : - throw HDFexception("Can't open HDF file : bad acces option"); + throw HDFexception("Can't open HDF file : bad access option"); } } diff --git a/src/HDFPersist/HDFnObjects.c b/src/HDFPersist/HDFnObjects.c index 1d01bf446..1a9d734ab 100644 --- a/src/HDFPersist/HDFnObjects.c +++ b/src/HDFPersist/HDFnObjects.c @@ -34,7 +34,7 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) * - Description : returns the number of HDF objets in a HDF group * - Parameters : * - fid (IN) : HDF file ID - * - path (IN) : acces path to the HDF group in the HDF file + * - path (IN) : access path to the HDF group in the HDF file * - Results : * - if success : number of objects * - if failure : -1 diff --git a/src/HDFPersist/HDFobjectIdentify.c b/src/HDFPersist/HDFobjectIdentify.c index 9e452fe2e..e57001e88 100644 --- a/src/HDFPersist/HDFobjectIdentify.c +++ b/src/HDFPersist/HDFobjectIdentify.c @@ -39,7 +39,7 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) * - i (IN) : access rank * - name (OUT) : expected name * - Result : - * - if sucess : 0 + * - if success : 0 * - if failure : -1 */ diff --git a/src/HDFPersist/test8.cxx b/src/HDFPersist/test8.cxx index bdfb2d58d..ffca9bf37 100644 --- a/src/HDFPersist/test8.cxx +++ b/src/HDFPersist/test8.cxx @@ -60,7 +60,7 @@ int main() // Transfert d'un fichier ASCII dans un groupe HDF HDFConvert::FromAscii("ascii.txt",*hdf_group,"ASCII DATASET"); - MESSAGE( ">> The Ascii file is transfered " ); + MESSAGE( ">> The ASCII file is transferred " ); // The HDF group is built, it can be closed hdf_group->CloseOnDisk(); diff --git a/src/KERNEL_PY/Help.py b/src/KERNEL_PY/Help.py index 7948abe7f..943e1ddc8 100755 --- a/src/KERNEL_PY/Help.py +++ b/src/KERNEL_PY/Help.py @@ -36,7 +36,7 @@ class SalomeDoc: doc_salome = ''' MODULE : salome --------------- -module salome gives access to Salome ressources: +module salome gives access to Salome resources: variables: salome.orb : CORBA @@ -134,7 +134,7 @@ A new python example avoids references to LifeCycleCORBA Help = SalomeDoc(''' Availables modules: - salome : gives access to Salome ressources + salome : gives access to Salome resources geompy : encapsulation of GEOM Engine methods supervision : gives access to SuperVision Engine To obtain specific help on a module "truc", type: Help.truc() diff --git a/src/KERNEL_PY/__init__.py b/src/KERNEL_PY/__init__.py index 84f40c655..ce4a8d46e 100755 --- a/src/KERNEL_PY/__init__.py +++ b/src/KERNEL_PY/__init__.py @@ -26,7 +26,7 @@ # Module : SALOME # """ -Module salome gives access to Salome ressources. +Module salome gives access to Salome resources. variables: @@ -71,7 +71,7 @@ variables: """ ## @package salome -# Module salome gives access to Salome ressources. +# Module salome gives access to Salome resources. # # \param salome.orb : CORBA orb object # \param salome.naming_service : instance of naming Service class (SALOME_NamingServicePy::SALOME_NamingServicePy_i) @@ -233,7 +233,7 @@ def salome_init(theStudyId=0,embedded=0): print """ ============================================ May be there is no running SALOME session - salome.salome_init() is intented to be used + salome.salome_init() is intended to be used within an already running session ============================================ """ diff --git a/src/KERNEL_PY/kernel/diclookup.py b/src/KERNEL_PY/kernel/diclookup.py index 263e6855c..1ec0eab17 100644 --- a/src/KERNEL_PY/kernel/diclookup.py +++ b/src/KERNEL_PY/kernel/diclookup.py @@ -23,7 +23,7 @@ ## \defgroup diclookup diclookup # \{ -# \details Smart dictionnary with key/value lookup +# \details Smart dictionary with key/value lookup # \} __author__="gboulant" diff --git a/src/KERNEL_PY/kernel/pyunittester.py b/src/KERNEL_PY/kernel/pyunittester.py index fa011080b..8c21ec568 100644 --- a/src/KERNEL_PY/kernel/pyunittester.py +++ b/src/KERNEL_PY/kernel/pyunittester.py @@ -75,7 +75,7 @@ class PyUnitTester(): for suite in self.__listTestSuite: runner.run(suite) - # Finally close the ouput stream and print the report + # Finally close the output stream and print the report logfile.close() self.printreport() diff --git a/src/KERNEL_PY/kernel/testdata.py b/src/KERNEL_PY/kernel/testdata.py index 21cd9ee6a..76485786f 100644 --- a/src/KERNEL_PY/kernel/testdata.py +++ b/src/KERNEL_PY/kernel/testdata.py @@ -133,7 +133,7 @@ def TEST_useBadRange(): def TEST_serialize(): import salome.kernel ref_testdata = TestData() - ref_testdata.setName("The firts name") + ref_testdata.setName("The first name") res_testdata = salome.kernel.unserialize(salome.kernel.serialize(ref_testdata)) print res_testdata.getName() diff --git a/src/KERNEL_PY/kernel/uiexception.py b/src/KERNEL_PY/kernel/uiexception.py index d1d2c8e2e..b777c4567 100644 --- a/src/KERNEL_PY/kernel/uiexception.py +++ b/src/KERNEL_PY/kernel/uiexception.py @@ -66,9 +66,9 @@ class UiException(Exception): def getUIMessage(self): return self._UImessage - ## Specify the type of this exception. To be choosen in the TYPES list. + ## Specify the type of this exception. To be chosen in the TYPES list. def setType(self, type): - """Specify the type of this exception. To be choosen in the TYPES list.""" + """Specify the type of this exception. To be chosen in the TYPES list.""" if not self.TYPES.isValid(type): raise UiException("The exception type "+str(type)+" can't be used",self.TYPES.DEVEL) self._type = type diff --git a/src/KERNEL_PY/kernel/unittester.py b/src/KERNEL_PY/kernel/unittester.py index be7c3baac..1a0001b98 100644 --- a/src/KERNEL_PY/kernel/unittester.py +++ b/src/KERNEL_PY/kernel/unittester.py @@ -53,15 +53,15 @@ def run(modulePath, functionName): print "[TEST] %s.%s %s NOT OK" % (moduleName, functionName,"."*tabsize) ## This function is for debug only. It executes the specified function with the -# specified arguments in a try/except bloc so that to display the exception in -# the case where an exception is raised (usefull to debug server side of a CORBA +# specified arguments in a try/except block so as to display the exception in +# the case where an exception is raised (useful to debug server side of a CORBA # process). # \ingroup unittester def tryfunction(function,*argv): """ This function is for debug only. It executes the specified function with the - specified arguments in a try/except bloc so that to display the exception in - the case where an exception is raised (usefull to debug server side of a CORBA + specified arguments in a try/except block so as to display the exception in + the case where an exception is raised (useful to debug server side of a CORBA process). """ print "[TEST] trying the function %s" % function diff --git a/src/KERNEL_PY/omnipatch.py b/src/KERNEL_PY/omnipatch.py index 1e2c0e7c6..963b1e3cb 100644 --- a/src/KERNEL_PY/omnipatch.py +++ b/src/KERNEL_PY/omnipatch.py @@ -41,7 +41,7 @@ shared_imported={} # Function to return a Python module for the required IDL module name def openModule(mname, fname=None): # Salome modification start - # Be sure to use the right module dictionnary + # Be sure to use the right module dictionary import sys # Salome modification end @@ -87,7 +87,7 @@ def openModule(mname, fname=None): # already exist def newModule(mname): # Salome modification start - # Be sure to use the right module dictionnary + # Be sure to use the right module dictionary import sys # Salome modification end @@ -117,7 +117,7 @@ def newModule(mname): # partial module map def updateModule(mname): # Salome modification start - # Be sure to use the right module dictionnary + # Be sure to use the right module dictionary import sys # Salome modification end if _partialModules.has_key(mname): diff --git a/src/KERNEL_PY/salome_iapp.py b/src/KERNEL_PY/salome_iapp.py index 283c5685c..67413b0f8 100755 --- a/src/KERNEL_PY/salome_iapp.py +++ b/src/KERNEL_PY/salome_iapp.py @@ -26,7 +26,7 @@ # Module : SALOME # $Header$ ## @package salome_iapp -# Module salome gives access to Salome GUI ressources (if GUI has been launched). +# Module salome gives access to Salome GUI resources (if GUI has been launched). # import salome_ComponentGUI diff --git a/src/KernelHelpers/SALOME_KernelServices.cxx b/src/KernelHelpers/SALOME_KernelServices.cxx index 481c1ac13..da50bdb07 100644 --- a/src/KernelHelpers/SALOME_KernelServices.cxx +++ b/src/KernelHelpers/SALOME_KernelServices.cxx @@ -63,7 +63,7 @@ namespace KERNEL { /** * This returns a static reference to the SALOME study manager. The * study manager can be used to retrieve a study or to get - * informations about a study. + * information about a study. */ SALOMEDS::StudyManager_ptr getStudyManager() { static SALOMEDS::StudyManager_ptr aStudyManager; @@ -157,7 +157,7 @@ namespace KERNEL { anObject = anORB->string_to_object(aValue); } }catch(...){ - INFOS("SObjectToObject - Unknown exception was occured!!!"); + INFOS("SObjectToObject - Unknown exception has occurred!!!"); } return anObject._retn(); } diff --git a/src/KernelHelpers/SALOME_StudyEditor.cxx b/src/KernelHelpers/SALOME_StudyEditor.cxx index 4a0bb4396..6eabba0e0 100644 --- a/src/KernelHelpers/SALOME_StudyEditor.cxx +++ b/src/KernelHelpers/SALOME_StudyEditor.cxx @@ -109,7 +109,7 @@ void SALOME_StudyEditor::setIcon(SALOMEDS::SObject_var sobject, const char * res // // MEM: AttributeParameter -// Note that the AttributeParameter is a multitype dictionnary whose +// Note that the AttributeParameter is a multitype dictionary whose // keys are the names specified when setting the value // diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx index d81ef8a04..c9b96b257 100644 --- a/src/Launcher/BatchTest.cxx +++ b/src/Launcher/BatchTest.cxx @@ -435,7 +435,7 @@ BatchTest::test_jobsubmit_simple() file_normal.close(); if (normal_input != "Bonjour") { - result += "error from simple ouput file ! waiting for Bonjour and get : " + normal_input; + result += "error from simple output file ! waiting for Bonjour and get : " + normal_input; return result; } std::string error_input; @@ -663,7 +663,7 @@ BatchTest::test_jobsubmit_mpi() file_normal.close(); if (!test_ok) { - result += "error from mpi ouput file ! waiting for HELLO MPI please watch /tmp/" + _date + "_mpi_output.log file"; + result += "error from mpi output file ! waiting for HELLO MPI please watch /tmp/" + _date + "_mpi_output.log file"; return result; } result = "OK"; diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt index e85ee37b1..87737c595 100755 --- a/src/Launcher/CMakeLists.txt +++ b/src/Launcher/CMakeLists.txt @@ -45,7 +45,7 @@ IF(SALOME_USE_LIBBATCH) ADD_DEFINITIONS(-DWITH_LIBBATCH) ENDIF(SALOME_USE_LIBBATCH) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS Registry SalomeNotification diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx index bd3f5d4b0..dfe536112 100644 --- a/src/Launcher/Launcher.cxx +++ b/src/Launcher/Launcher.cxx @@ -133,7 +133,7 @@ Launcher_cpp::launchJob(int job_id) throw LauncherException("Bad state of the job: " + job->getState()); } - // Third step search batch manager for the job into the map -> instanciate one if does not exist + // Third step search batch manager for the job into the map -> instantiate one if does not exist #ifdef WITH_LIBBATCH std::map::const_iterator it = _batchmap.find(job_id); if(it == _batchmap.end()) @@ -426,7 +426,7 @@ Launcher_cpp::createJobWithFile(const std::string xmlExecuteFile, //============================================================================= /*! - * Factory to instanciate the good batch manager for choosen cluster. + * Factory to instantiate the good batch manager for chosen cluster. */ //============================================================================= Batch::BatchManager * @@ -524,7 +524,7 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params) LAUNCHER_MESSAGE("Cannot find batch manager factory for " << bmType << ". Check your version of libBatch."); throw LauncherException("Cannot find batch manager factory"); } - LAUNCHER_MESSAGE("Instanciation of batch manager of type: " << bmType); + LAUNCHER_MESSAGE("Instantiation of batch manager of type: " << bmType); Batch::BatchManager * batch_client = (*fact)(hostname.c_str(), params.UserName.c_str(), protocol, mpi.c_str()); return batch_client; @@ -665,7 +665,7 @@ Launcher_cpp::createBatchManagerForJob(Launcher::Job * job) { int job_id = job->getNumber(); - // Select a ressource for the job + // Select a resource for the job std::vector ResourceList; resourceParams params = job->getResourceRequiredParams(); // Consider only resources that can launch batch jobs @@ -788,7 +788,7 @@ Launcher_cpp::loadJobs(const char* jobs_file) { if (job_state == "CREATED") { - // In this case, we ignore run_part informations + // In this case, we ignore run_part information createJob(new_job); new_jobs_id_list.push_back(new_job->getNumber()); } @@ -814,7 +814,7 @@ Launcher_cpp::loadJobs(const char* jobs_file) job_state == "FAILED" || job_state == "ERROR") { - // Step 2: We add run_part informations + // Step 2: We add run_part information addJobDirectlyToMap(new_job); new_jobs_id_list.push_back(new_job->getNumber()); } diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx index e046fd8cf..2aae078fe 100644 --- a/src/Launcher/Launcher_Job.cxx +++ b/src/Launcher/Launcher_Job.cxx @@ -525,7 +525,7 @@ Launcher::Job::getLaunchDate() const launch_date[i] == ':' || launch_date[i] == ' ') launch_date[i] = '_'; - launch_date.erase(--launch_date.end()); // Last caracter is a \n + launch_date.erase(--launch_date.end()); // Last character is a \n return launch_date; } diff --git a/src/Launcher/SALOME_Launcher.cxx b/src/Launcher/SALOME_Launcher.cxx index d37cb04e5..9a524131d 100644 --- a/src/Launcher/SALOME_Launcher.cxx +++ b/src/Launcher/SALOME_Launcher.cxx @@ -356,7 +356,7 @@ SALOME_Launcher::stopJob(CORBA::Long job_id) /*! CORBA Method: * Create a job in the launcher with a file * \param xmlExecuteFile : .xml to parse that contains job description - * \param clusterName : machine choosed + * \param clusterName : machine chosen */ //============================================================================= CORBA::Long diff --git a/src/Launcher/Test/test_launcher.py b/src/Launcher/Test/test_launcher.py index 546b0057f..33dbf0044 100755 --- a/src/Launcher/Test/test_launcher.py +++ b/src/Launcher/Test/test_launcher.py @@ -20,10 +20,10 @@ def mkdir_p(path): # Test of SalomeLauncher. # This test should be run in the salome environment, using "salome shell" # and a salome application should be running. -# The test will try to launch batch jobs on every available ressources which +# The test will try to launch batch jobs on every available resources which # have the can_launch_batch_jobs parameter set to True. # You can use the environment variable USER_CATALOG_RESOURCES_FILE in order to -# define a customised ressource catalog. +# define a customised resource catalog. # If YACS_ROOT_DIR is not set, the test of submitting a YACS schema will be # skiped. class TestCompo(unittest.TestCase): diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index 75bf0dd5e..cf181f04e 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -102,7 +102,7 @@ SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA(SALOME_NamingService *ns) // (in SALOMEDS for an example) // not enough: set a current directory in naming service is not thread safe // if naming service instance is shared among several threads... - // ==> allways use absolute path and dot rely on current directory! + // ==> always use absolute path and don't rely on current directory! CORBA::Object_var obj = _NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS); diff --git a/src/Logger/SALOME_Trace.cxx b/src/Logger/SALOME_Trace.cxx index 7a12648a6..2278daa99 100644 --- a/src/Logger/SALOME_Trace.cxx +++ b/src/Logger/SALOME_Trace.cxx @@ -138,7 +138,7 @@ void SALOME_Trace::putMessage(std::ostream& msg) { //if (!isInitialized) std::cout<<"!!! SALOME_Trace is used without initialising !!!"<_verify_path_prefix(myPrivate->_general_path_list)) { if(MYDEBUG) MESSAGE( "Error while parsing the general path list, " - "differents paths are associated to the same computer," - "the first one will be choosen"); + "different paths are associated to the same computer," + "the first one will be chosen"); } else { if(MYDEBUG) MESSAGE("General path list OK"); } @@ -283,8 +283,8 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA: // Verification of _general_path_list content if(!myPrivate->_verify_path_prefix(myPrivate->_personal_path_list)){ if(MYDEBUG) MESSAGE("Error while parsing the personal path list, " - "differents paths are associated to the same computer, " - "the first one will be choosen" ); + "different paths are associated to the same computer, " + "the first one will be chosen" ); }else { if(MYDEBUG) MESSAGE("Personal path list OK"); } diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index 98d27c9f3..b224370e0 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -139,7 +139,7 @@ void SALOME_NamingService::Register(CORBA::Object_ptr ObjRef, Utils_Locker lock (&_myMutex); // --- _current_context is replaced to the _root_context - // if the Path begins whith '/' + // if the Path begins with '/' if (Path[0] == '/'){ _current_context = _root_context; @@ -334,7 +334,7 @@ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) Utils_Locker lock (&_myMutex); // --- _current_context is replaced to the _root_context - // if the Path begins whith '/' + // if the Path begins with '/' if (Path[0] == '/') { @@ -403,7 +403,7 @@ CORBA::Object_ptr SALOME_NamingService::Resolve(const char* Path) /*! \brief get the CORBA object reference associated to an uncomplete name. * * get the CORBA object reference associated to an uncomplete name with a - * path. Look for the first occurence of name*. + * path. Look for the first occurrence of name*. * 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)" @@ -467,7 +467,7 @@ CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) * If the NamingService is out, the exception ServiceUnreachable is thrown. * \param hostname name of the machine on which the component is searched. * \param containerName name of the container in which the component is - instanciated. + instantiated. * \param componentName name of the component we are looking for an existing instance. * \param nbproc in case of multi processor machine, container name is @@ -614,7 +614,7 @@ std::string SALOME_NamingService::ContainerName(const Engines::ContainerParamete * SALOME_NamingService. This form gives a suffixed containerName in case of * multi processor machine. * \param containerName name of the container in which the component is - instanciated. + instantiated. * \param hostname name of the host of the container, without domain names. * \return the path under the form /Containers/hostname/containerName * \sa ContainerName(const Engines::MachineParameters& params) @@ -657,12 +657,12 @@ std::string SALOME_NamingService::BuildContainerNameForNS(const Engines::Contain /*! \brief search a name in current directory. * * Search a name in the current directory. after call, the current directory - * is changed to the directory containing the last occurence of name found. - * If no occurence found (see return value), current directory remains + * is changed to the directory containing the last occurrence of name found. + * If no occurrence found (see return value), current directory remains * unchanged. * * \param name the name to search. - * \return number of occurences found. + * \return number of occurrences found. * \sa Change_Directory(const char* Path) */ // ============================================================================ @@ -702,8 +702,8 @@ throw(ServiceUnreachable) * path, to current context. Prefer absolute pathname, relative * pathname are not safe, when SALOME_NamingService object is * shared or use in multithreaded context. - * \return true if successfull - * (creation not strictly garanteed if true, because Register may + * \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) @@ -773,7 +773,7 @@ bool SALOME_NamingService::Change_Directory(const char* Path) throw(ServiceUnrea CosNaming::NamingContext_var current_context = _current_context; bool changeOK = false; - // --- replace _current_context with _root_context if Path begins whith '/' + // --- replace _current_context with _root_context if Path begins with '/' if (path[0] == '/') current_context = _root_context; @@ -1464,7 +1464,7 @@ void SALOME_NamingService::_initialize_root_context() * \param context_name CosNaming structure to put the path. * \param splitPath a vector of string with subdirectories and final * object, if any. - * \param onlyDir if true, final object (if any) is ommited + * \param onlyDir if true, final object (if any) is omitted * in context_name. * if false, final object (if any) is included in * context_name. @@ -1534,12 +1534,12 @@ SALOME_NamingService::_createContextNameDir(std::string path, /*! \brief search a name in current directory. * * Search a name in the current directory. after call, the current directory - * is changed to the directory containing the last occurence of name found. - * If no occurence found (see return value), current directory remains + * is changed to the directory containing the last occurrence of name found. + * If no occurrence found (see return value), current directory remains * unchanged. The call is recursive. * * \param name the name to search. - * \param occurence_number number of occurence already found (incremented) + * \param occurence_number number of occurrence already found (incremented) */ // ============================================================================ @@ -1583,11 +1583,11 @@ void SALOME_NamingService::_Find(const char* name, if (!strcmp( bindingName[0].id, name)) { - //MESSAGE("One occurence was found"); + //MESSAGE("One occurrence was found"); occurence_number++; // --- We keep in memory the directory where - // one occurence was found + // one occurrence was found found_context = _current_context ; } @@ -1596,7 +1596,7 @@ void SALOME_NamingService::_Find(const char* name, binding_iterator->destroy(); } - // --- We go to the last directory where an occurence was found + // --- We go to the last directory where an occurrence was found _current_context = found_context; @@ -1685,7 +1685,7 @@ _current_directory(std::vector& splitPath, binding_iterator->destroy(); } - // --- return to the last directory where an occurence was found + // --- return to the last directory where an occurrence was found _current_context = ref_context ; } diff --git a/src/NamingService/Test/CMakeLists.txt b/src/NamingService/Test/CMakeLists.txt index 743463cd1..9117dd215 100755 --- a/src/NamingService/Test/CMakeLists.txt +++ b/src/NamingService/Test/CMakeLists.txt @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS ${CPPUNIT_LIBRARIES} SalomeNS diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt index e0f928250..8c76334e5 100755 --- a/src/ParallelContainer/CMakeLists.txt +++ b/src/ParallelContainer/CMakeLists.txt @@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/SALOMETraceCollector ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS SalomeContainer SalomeNS diff --git a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx index 25267d785..9387dbaac 100644 --- a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx +++ b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx @@ -350,7 +350,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN string instanceName = aCompName + "_inst_" + aNumI ; string component_registerName = _containerName + "/" + instanceName; - // --- Instanciate required CORBA object + // --- Instantiate required CORBA object Container_proxy_impl_final::proxy_object * proxy = new Container_proxy_impl_final::proxy_object(); proxy->proxy_id = (component_proxy_factory) (_orb, @@ -386,7 +386,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN } catch (...) { - INFOS( "Exception catched in Proxy creation" ); + INFOS( "Exception caught in Proxy creation" ); return Engines::EngineComponent::_nil(); } diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx index 7a593f665..e4f1c1254 100644 --- a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx +++ b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx @@ -66,7 +66,7 @@ extern "C" {void SigIntHandler( int ) ; } //============================================================================= /*! - * Construtor + * Constructor */ //============================================================================= @@ -282,7 +282,7 @@ void Engines_Parallel_Container_i::Shutdown() * \param componentName like COMPONENT * try to make a Python import of COMPONENT, * then a lib open of libCOMPONENTEngine.so - * \return true if dlopen successfull or already done, false otherwise + * \return true if dlopen successful or already done, false otherwise */ //============================================================================= @@ -635,7 +635,7 @@ Engines_Parallel_Container_i::createFileRef(const char* origFileName) if (origName[0] != '/') { - INFOS("path of file to copy must be an absolute path begining with '/'"); + INFOS("path of file to copy must be an absolute path beginning with '/'"); return Engines::fileRef::_nil(); } @@ -757,7 +757,7 @@ Engines_Parallel_Container_i::find_or_create_instance(std::string genericRegiste } catch (...) { - INFOS( "Container_i::load_impl catched" ) ; + INFOS( "Container_i::load_impl caught" ) ; } return iobject._retn(); } @@ -891,7 +891,7 @@ Engines_Parallel_Container_i::createCPPInstance(std::string genericRegisterName, std::string component_registerName = _containerName + "/" + instanceName; - // --- Instanciate required CORBA object + // --- Instantiate required CORBA object PortableServer::ObjectId *id; //not owner, do not delete (nore use var) id = (Component_factory) ( _orb, _poa, _id, instanceName.c_str(), @@ -926,7 +926,7 @@ Engines_Parallel_Container_i::createCPPInstance(std::string genericRegisterName, } catch (...) { - INFOS( "Container_i::createInstance exception catched" ); + INFOS( "Container_i::createInstance exception caught" ); } return iobject._retn(); } @@ -998,7 +998,7 @@ Engines_Parallel_Container_i::create_paco_component_node_instance(const char* co std::string instanceName = aCompName + "_inst_" + aNumI + "_work_node_" + aNumI2; std::string component_registerName = _containerName + "/" + instanceName; - // --- Instanciate work node + // --- Instantiate work node PortableServer::ObjectId *id ; //not owner, do not delete (nore use var) id = (Component_factory) (_orb, proxy_ior, getMyRank(), _poa, _id, instanceName.c_str(), componentName); CORBA::string_free(proxy_ior); @@ -1021,10 +1021,10 @@ Engines_Parallel_Container_i::create_paco_component_node_instance(const char* co } catch (...) { - INFOS("Container_i::create_paco_component_node_instance exception catched"); + INFOS("Container_i::create_paco_component_node_instance exception caught"); SALOME::ExceptionStruct es; es.type = SALOME::INTERNAL_ERROR; - es.text = "Container_i::create_paco_component_node_instance exception catched"; + es.text = "Container_i::create_paco_component_node_instance exception caught"; throw SALOME::SALOME_Exception(es); } } diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt index 73aaa078e..458f45a2d 100755 --- a/src/ResourcesManager/CMakeLists.txt +++ b/src/ResourcesManager/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES( ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS SalomeNS OpUtil diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx index 03a0bf684..55cc8a3c7 100644 --- a/src/ResourcesManager/ResourcesManager.cxx +++ b/src/ResourcesManager/ResourcesManager.cxx @@ -319,7 +319,7 @@ ResourcesManager_cpp::GetFittingResources(const resourceParams& params) throw(Re //============================================================================= /*! - * add an entry in the ressources catalog xml file. + * add an entry in the resources catalog xml file. */ //============================================================================= diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx index 1f140f49c..5e8c54d66 100644 --- a/src/ResourcesManager/ResourcesManager.hxx +++ b/src/ResourcesManager/ResourcesManager.hxx @@ -106,11 +106,11 @@ class RESOURCESMANAGER_EXPORT ResourcesManager_cpp */ void AddDefaultResourceInCatalog(); - //! will contain the path to the ressources catalog + //! will contain the path to the resources catalog std::list _path_resources; std::list::iterator _path_resources_it; - //! will contain the informations on the data type catalog(after parsing) + //! will contain the information on the data type catalog(after parsing) MapOfParserResourcesType _resourcesList; //! a map that contains all the available load rate managers (the key is the name) diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index 8b09d8bdd..f9686e195 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -139,7 +139,7 @@ void SALOME_ResourcesManager::Shutdown() } /*! - * Return list of resources available (regarding containt of CatalogResources.xml). And for each resource the number of proc available of it. + * Return list of resources available (regarding content of CatalogResources.xml). And for each resource the number of proc available of it. */ void SALOME_ResourcesManager::ListAllAvailableResources(Engines::ResourceList_out machines, Engines::IntegerList_out nbProcsOfMachines) { @@ -184,7 +184,7 @@ void SALOME_ResourcesManager::ListAllAvailableResources(Engines::ResourceList_ou Engines::ResourceList * SALOME_ResourcesManager::GetFittingResources(const Engines::ResourceParameters& params) { - MESSAGE("ResourcesManager::GetFittingResources"); + //MESSAGE("ResourcesManager::GetFittingResources"); Engines::ResourceList_var ret; // CORBA -> C++ @@ -419,7 +419,7 @@ SALOME_ResourcesManager::getMachineFile(const char * resource_name, INFOS("[getMachineFile] Error resource_name MPI implementation was defined for " << resource_name); } else - INFOS("[getMachineFile] Error resource_name MPI implementation not currenly handled for " << resource_name); + INFOS("[getMachineFile] Error resource_name MPI implementation not currently handled for " << resource_name); } else INFOS("[getMachineFile] Error resource_name not found in resourcesList -> " << resource_name); diff --git a/src/SALOMEDS/README_attributes b/src/SALOMEDS/README_attributes index 11655ed3d..d552235ee 100644 --- a/src/SALOMEDS/README_attributes +++ b/src/SALOMEDS/README_attributes @@ -45,7 +45,7 @@ M src/SALOMEDS/Makefile.in M src/SALOMEDS/SALOMEDS_SObject_i.cxx M src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx -# detailled modifications: +# detailed modifications: - in new files, change ExternalFileDef in FileType everywhere diff --git a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx index a4e1f2d0a..23d234ffe 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx @@ -32,7 +32,7 @@ Description : This class is intended for storing different object attributes that have only two states (0 and 1). - Avalable attributes: + Available attributes: IS_VISIBLE - is equal to 1 if object is visible in 3D view (0 - overwise). This attribute is valid for active view only. diff --git a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.hxx index 2b708c3bc..d9d7ed188 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.hxx +++ b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.hxx @@ -41,7 +41,7 @@ Description : This class is intended for storing different object attributes that have only two states (0 and 1). - Avalable attributes: + Available attributes: IS_VISIBLE - is equal to 1 if object is visible in 3D view (0 - overwise). This attribute is valid for active view only. diff --git a/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx b/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx index ea539097a..fcc048cae 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx @@ -426,7 +426,7 @@ bool SALOMEDS_AttributeParameter::HasFather() //======================================================================= /*! * Function : IsRoot - * Purpose : Returns True is the attribute is highest in an hierachy + * Purpose : Returns True is the attribute is highest in an hierarchy */ //======================================================================= bool SALOMEDS_AttributeParameter::IsRoot() diff --git a/src/SALOMEDS/SALOMEDS_AttributeParameter_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeParameter_i.cxx index 7756f15ab..40eca2d82 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeParameter_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeParameter_i.cxx @@ -319,7 +319,7 @@ CORBA::Boolean SALOMEDS_AttributeParameter_i::HasFather() //======================================================================= /*! * Function : IsRoot - * Purpose : Returns True is the attribute is highest in an hierachy + * Purpose : Returns True is the attribute is highest in an hierarchy */ //======================================================================= CORBA::Boolean SALOMEDS_AttributeParameter_i::IsRoot() diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx index 6113ccc98..c5eefdfaa 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx @@ -138,7 +138,7 @@ SALOMEDS::Study_ptr SALOMEDS_StudyManager_i::NewStudy(const char* study_name) SALOMEDS::Study_var Study = Study_servant->_this(); // Register study in the naming service - // Path to acces the study + // Path to access the study if(!_name_service->Change_Directory("/Study")) MESSAGE( "Unable to access the study directory" ) else @@ -197,7 +197,7 @@ SALOMEDS::Study_ptr SALOMEDS_StudyManager_i::Open(const char* aUrl) _mapOfPOA[Study->StudyId()] = _poa; // Register study in the naming service - // Path to acces the study + // Path to access the study if(!_name_service->Change_Directory("/Study")) MESSAGE( "Unable to access the study directory" ) else _name_service->Register(Study, aStudyImpl->Name().c_str()); diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt index 67615795f..679a7feb2 100755 --- a/src/SALOMEDS/Test/CMakeLists.txt +++ b/src/SALOMEDS/Test/CMakeLists.txt @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/idl ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS ${CPPUNIT_LIBRARIES} SALOMEBasics diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx index b54547251..f2da850aa 100755 --- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx +++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeParameter.cxx @@ -60,7 +60,7 @@ void SALOMEDSTest::testAttributeParameter() //Check the attribute creation CPPUNIT_ASSERT(_attr); - //Try to retreive a value with invalid ID + //Try to retrieve a value with invalid ID bool isRaised = false; CPPUNIT_ASSERT(!_attr->IsSet("invalid ID", PT_INTEGER)); try { diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx index 62f714515..273edef44 100755 --- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx +++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfInteger.cxx @@ -96,7 +96,7 @@ void SALOMEDSTest::testAttributeSequenceOfInteger() CPPUNIT_ASSERT(_attr->Value(4) == 5); - //Check processing of invalid indicies + //Check processing of invalid indices bool isRaised = false; try { _attr->Value(-1); diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx index 2772a71bd..48b988ad6 100755 --- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx +++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeSequenceOfReal.cxx @@ -90,7 +90,7 @@ void SALOMEDSTest::testAttributeSequenceOfReal() CPPUNIT_ASSERT(_attr->Value(4) == 5.5); - //Check processing of invalid indicies + //Check processing of invalid indices bool isRaised = false; try { _attr->Value(-1); diff --git a/src/SALOMEDSImpl/CMakeLists.txt b/src/SALOMEDSImpl/CMakeLists.txt index 5038a832a..a1e643b08 100755 --- a/src/SALOMEDSImpl/CMakeLists.txt +++ b/src/SALOMEDSImpl/CMakeLists.txt @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES( # This local variable defines the list of FLAGS common to all target in this package. ADD_DEFINITIONS(${BOOST_DEFINITIONS}) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS SALOMEBasics SalomeHDFPersist diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx index 04d410953..7b2b1229e 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeParameter.cxx @@ -457,7 +457,7 @@ bool SALOMEDSImpl_AttributeParameter::HasFather() //======================================================================= /*! * Function : IsRoot - * Purpose : Returns True is the attribute is highest in an hierachy + * Purpose : Returns True is the attribute is highest in an hierarchy */ //======================================================================= bool SALOMEDSImpl_AttributeParameter::IsRoot() diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx index 6b9c59d08..d33b0e145 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx @@ -288,7 +288,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save() aProperty[a++] = 1; } - //Write delimeter of the section to define end of the modifications section + //Write delimiter of the section to define end of the modifications section aProperty[a++] = 30; //Write units if need @@ -297,7 +297,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save() a = strlen(aProperty); } - aProperty[a++] = 1; //delimeter of the units and comments + aProperty[a++] = 1; //delimiter of the units and comments //Write comments if need if(comment.size() > 0) { @@ -305,7 +305,7 @@ std::string SALOMEDSImpl_AttributeStudyProperties::Save() a = strlen(aProperty); } - aProperty[a++] = 30; //delimeter of the component versions + aProperty[a++] = 30; //delimiter of the component versions std::map::const_iterator versionsIt; for ( versionsIt = versions.begin(); versionsIt != versions.end(); ++versionsIt ) { @@ -455,7 +455,7 @@ void SALOMEDSImpl_AttributeStudyProperties::Load(const std::string& value) //Case when study contains units and comment properties if( anIndex < value.size() ) { - anIndex++; //skip the delimeter of the sections: char(30) + anIndex++; //skip the delimiter of the sections: char(30) int unitsSize; for(unitsSize = 0; aCopy[anIndex+unitsSize] != 1; unitsSize++); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx index d05604ea5..9e3e1e444 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx @@ -507,7 +507,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveProperties(SALOMEDSImpl_Study* aStudy, //..........................., //component=versions, char(1), char(0) - //string length: 1 byte = locked flag, 1 byte = modified flag, (12 + name length + 1) for each name and date, 1 byte (char(30) section delimeter) + //string length: 1 byte = locked flag, 1 byte = modified flag, (12 + name length + 1) for each name and date, 1 byte (char(30) section delimiter) // unit length + 1, comment length, "zero" byte char* aProperty = new char[3 + aLength + 12 * aNames.size() + 1 + unitsSize + 1 + commentSize + 1 + aLength1 ]; @@ -528,7 +528,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveProperties(SALOMEDSImpl_Study* aStudy, aProperty[a++] = 1; } - //Write delimeter of the section to define end of the modifications section + //Write delimiter of the section to define end of the modifications section aProperty[a++] = 30; //Write units if need @@ -545,7 +545,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveProperties(SALOMEDSImpl_Study* aStudy, a = strlen(aProperty); } - aProperty[a++] = 30; //delimeter of the component versions + aProperty[a++] = 30; //delimiter of the component versions std::map::const_iterator versionsIt; for ( versionsIt = versions.begin(); versionsIt != versions.end(); ++versionsIt ) { @@ -585,11 +585,11 @@ bool SALOMEDSImpl_StudyManager::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 - // Informations in data group hdf_group_datacomponent + // Information in data group hdf_group_datacomponent // * Study Structure -> Exactly what is contained in Document - // Informations in data group hdf_group_study_structure + // Information in data group hdf_group_study_structure _errorCode = ""; @@ -666,7 +666,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveAs(const std::string& aStudyUrl, aStudy->URL(aStudyUrl); // To change for Save - // Do not have to do a new file but just a Open??? Rewrite all informations 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(); @@ -733,7 +733,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveAs(const std::string& aStudyUrl, hdf_dataset->WriteOnDisk((void*)(theASCII?"A":"B")); // save: ASCII or BINARY hdf_dataset->CloseOnDisk(); hdf_dataset=0; //will be deleted by hdf_sco_AuxFiles destructor - // Creation of the persistance reference attribute + // Creation of the persistence reference attribute Translate_IOR_to_persistentID (sco, Engine, theMultiFile, theASCII); } } @@ -955,7 +955,7 @@ bool SALOMEDSImpl_StudyManager::Impl_SaveObject(const SALOMEDSImpl_SObject& SC, { _errorCode = ""; - // Write in group hdf_group_datatype all informations of SObject SC + // Write in group hdf_group_datatype all information of SObject SC // Iterative function to parse all SObjects under a SComponent HDFgroup *hdf_group_sobject = 0; @@ -1405,7 +1405,7 @@ static void ReadAttributes(SALOMEDSImpl_Study* theStudy, if (!strcmp(hdf_dataset->GetName(),"COMPONENTDATATYPE")) { anAttr = theStudy->NewBuilder()->FindOrCreateAttribute(aSO, "AttributeComment"); } else if (!strcmp(hdf_dataset->GetName(),"AttributeReference") || - !strcmp(hdf_dataset->GetName(),"Reference")) { // Old format maintainance + !strcmp(hdf_dataset->GetName(),"Reference")) { // Old format maintenance theStudy->NewBuilder()->Addreference(aSO, theStudy->CreateObjectID(current_string)); delete [] (current_string); hdf_dataset->CloseOnDisk(); diff --git a/src/SALOMEDSImpl/Test/CMakeLists.txt b/src/SALOMEDSImpl/Test/CMakeLists.txt index 24a4b7cc5..18b35d2ab 100755 --- a/src/SALOMEDSImpl/Test/CMakeLists.txt +++ b/src/SALOMEDSImpl/Test/CMakeLists.txt @@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/idl ) -# This local variable defines the list of dependant libraries common to all target in this package. +# This local variable defines the list of dependent libraries common to all target in this package. SET(COMMON_LIBS ${CPPUNIT_LIBRARIES} SALOMEBasics diff --git a/src/SALOMEDSImpl/testDS.cxx b/src/SALOMEDSImpl/testDS.cxx index 640089457..026dcaf01 100644 --- a/src/SALOMEDSImpl/testDS.cxx +++ b/src/SALOMEDSImpl/testDS.cxx @@ -102,7 +102,7 @@ int main (int argc, char * argv[]) aTDFAttr = aBuilder->FindOrCreateAttribute(aSubSO, "AttributeUserID"); if(aTDFAttr) { - std::cout << "Attribute UserID was created succesfully : id = " << dynamic_cast(aTDFAttr)->Value() << std::endl; + std::cout << "Attribute UserID was created successfully : id = " << dynamic_cast(aTDFAttr)->Value() << std::endl; } else std::cout << "Can't create AttributeUserID" << std::endl; @@ -113,7 +113,7 @@ int main (int argc, char * argv[]) std::string id2 = "0e1c36e6-379b-4d90-ab3b-18a14310e648"; aTDFAttr = aBuilder->FindOrCreateAttribute(aSubSO, "AttributeUserID"+id2); if(aTDFAttr) { - std::cout << "Attribute UserID was created succesfully : id = " << dynamic_cast(aTDFAttr)->Value() << std::endl; + std::cout << "Attribute UserID was created successfully : id = " << dynamic_cast(aTDFAttr)->Value() << std::endl; } else std::cout << "Can't create AttributeUserID" << std::endl; diff --git a/src/SALOMELocalTrace/FileTraceCollector.cxx b/src/SALOMELocalTrace/FileTraceCollector.cxx index 20037de4f..54f1463fb 100644 --- a/src/SALOMELocalTrace/FileTraceCollector.cxx +++ b/src/SALOMELocalTrace/FileTraceCollector.cxx @@ -41,7 +41,7 @@ std::string FileTraceCollector::_fileName = ""; /*! * This class is for use without CORBA, inside or outside SALOME. * SALOME uses SALOMETraceCollector, to allow trace collection via CORBA. - * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool. + * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool. * * Guarantees a unique object instance of the class (singleton thread safe) * a separate thread for loop to print traces is launched. @@ -78,7 +78,7 @@ BaseTraceCollector* FileTraceCollector::instance(const char *fileName) // ============================================================================ /*! * In a separate thread, loop to print traces. - * Mutex garantees intialisation on instance method is done and only one run + * Mutex guarantees intialisation on instance method is done and only one run * allowed (double check ...) * Loop until there is no more buffer to print, * and no ask for end from destructor. diff --git a/src/SALOMELocalTrace/LocalTraceCollector.cxx b/src/SALOMELocalTrace/LocalTraceCollector.cxx index b6199f6df..45f738948 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.cxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.cxx @@ -36,7 +36,7 @@ /*! * This class is for use without CORBA, inside or outside SALOME. * SALOME uses SALOMETraceCollector, to allow trace collection via CORBA. - * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool. + * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool. * * Guarantees a unique object instance of the class (singleton thread safe) * a separate thread for loop to print traces is launched. @@ -68,7 +68,7 @@ BaseTraceCollector* LocalTraceCollector::instance() // ============================================================================ /*! * In a separate thread, loop to print traces. - * Mutex garantees intialisation on instance method is done and only one run + * Mutex guarantees intialisation on instance method is done and only one run * allowed (double check ...) * Loop until there is no more buffer to print, * and no ask for end from destructor. diff --git a/src/SALOMELocalTrace/utilities.h b/src/SALOMELocalTrace/utilities.h index 4d70e3f52..dbfa0d34b 100644 --- a/src/SALOMELocalTrace/utilities.h +++ b/src/SALOMELocalTrace/utilities.h @@ -26,7 +26,7 @@ // Module : SALOME // $Header$ // -/* --- Definition macros file to print informations if _DEBUG_ is defined --- */ +/* --- Definition macros file to print information if _DEBUG_ is defined --- */ #ifndef UTILITIES_H #define UTILITIES_H @@ -47,7 +47,7 @@ * This buffer is read later by a specific thread in charge of trace print. * Order of trace entries is globally respected. Nevertheless, if there are * several threads waiting for a free buffer to trace, the order of - * thread waken up is not garanteed (no fifo or priority rules in Linux Kernel) + * thread waken up is not guaranteed (no fifo or priority rules in Linux Kernel) */ #define MESS_INIT(deb) std::ostringstream os; os<create_thread_policy(PortableServer::SINGLE_THREAD_MODEL)); policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol); // all is in PortableServer::POAManager::_nil. By specifying _nil cf Advanced CORBA Programming with C++ p 506 - // a new POA manager is created. This POA manager is independant from POA manager of the son ones. + // a new POA manager is created. This POA manager is independent from POA manager of the son ones. _poa_for_request_control=poa->create_POA("4RqstSwitcher",PortableServer::POAManager::_nil(),policies); threadPol->destroy(); PortableServer::POAManager_var mgr(_poa_for_request_control->the_POAManager()); diff --git a/src/SALOMETraceCollector/SALOMETraceCollector.cxx b/src/SALOMETraceCollector/SALOMETraceCollector.cxx index e386b9363..655230147 100644 --- a/src/SALOMETraceCollector/SALOMETraceCollector.cxx +++ b/src/SALOMETraceCollector/SALOMETraceCollector.cxx @@ -45,7 +45,7 @@ CORBA::ORB_ptr SALOMETraceCollector::_orb = 0; // ============================================================================ /*! * This class is for use with CORBA, inside SALOME. - * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool. + * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool. * * Guarantees a unique object instance of the class (singleton thread safe) * a separate thread for loop to print traces is launched. @@ -82,7 +82,7 @@ BaseTraceCollector* SALOMETraceCollector::instance() // ============================================================================ /*! * In a separate thread, loop to print traces. - * Mutex garantees intialisation on instance method is done and only one run + * Mutex guarantees intialisation on instance method is done and only one run * allowed (double check ...) * Loop until there is no more buffer to print, * and no ask for end from destructor. diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx index 1b6c0e443..c2d09d849 100644 --- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx +++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx @@ -89,7 +89,7 @@ public : * * Design description * - * The destruction object must be created dynamicaly because it suscribes himself in the list of + * The destruction object must be created dynamically because it subcribes itself in the list of * destruction to be performed at the end of the process. * */ diff --git a/src/Utils/Utils_Identity.cxx b/src/Utils/Utils_Identity.cxx index 04c2290c5..f6cc23699 100644 --- a/src/Utils/Utils_Identity.cxx +++ b/src/Utils/Utils_Identity.cxx @@ -183,7 +183,7 @@ Identity::~Identity(void) free((char*)_dir); #ifndef WIN32 // free the memory only on Unix - // becasue at Windows it is the same static variable + // because in Windows it is the same static variable // (function get_adip() returns the same char* as get_uname() ) delete [] (char*)_adip ; #endif diff --git a/src/Utils/Utils_Identity.py b/src/Utils/Utils_Identity.py index 0ff7f7bb0..627d1b9d2 100644 --- a/src/Utils/Utils_Identity.py +++ b/src/Utils/Utils_Identity.py @@ -45,7 +45,7 @@ def getShortHostName(): gives Hostname without domain extension. SALOME naming service needs short Hostnames (without domain extension). - HOSTNAME is not allways defined in environment, + HOSTNAME is not always defined in environment, socket.gethostname() gives short or complete Hostname, depending on defined aliases. """ @@ -56,7 +56,7 @@ class Identity: self._name = name self._pid = os.getpid() self._machine = socket.gethostname() - self._adip = socket.gethostbyname(self._machine) # IP adress + self._adip = socket.gethostbyname(self._machine) # IP address if sys.platform == "win32": self._uid = os.getpid() self._pwname = os.environ["USERNAME"]