Merge branch 'master' of salome:modules/shaper

[modules/shaper.git] / src / Config / Config_ModuleReader.cpp

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index d298a412c0b4282a6c4151049791aaa62fb4480e..2fd33f6cda947d90b50a1a065d6902ede4152340 100644 (file)
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -65,13 +65,28 @@ std::string Config_ModuleReader::getModuleName()
   return getProperty(aRoot, PLUGINS_MODULE);
 }
 
+
+void Config_ModuleReader::addFeature(const std::string& theFeatureName,
+                                     const std::string& thePluginConfig)
+{
+  if (myFeaturesInFiles.count(theFeatureName)) {
+    std::string anErrorMsg = "Can not register feature '" + theFeatureName + "' in plugin '"
+        + thePluginConfig + "'. There is a feature with the same ID.";
+    Events_Error::send(anErrorMsg);
+    return;
+  }
+
+  myFeaturesInFiles[theFeatureName] = thePluginConfig;
+}
+
 void Config_ModuleReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_PLUGIN, NULL)) {
     if (!hasRequiredModules(theNode))
       return;
     std::string aPluginConf = getProperty(theNode, PLUGIN_CONFIG);
-    if (!aPluginConf.empty()) myPluginFiles.insert(aPluginConf);
+    if (!aPluginConf.empty())
+      myPluginFiles.insert(aPluginConf);
     std::string aPluginLibrary = getProperty(theNode, PLUGIN_LIBRARY);
     std::string aPluginScript = getProperty(theNode, PLUGIN_SCRIPT);
     std::string aPluginName = addPlugin(aPluginLibrary, aPluginScript, aPluginConf);
@@ -79,7 +94,7 @@ void Config_ModuleReader::processNode(xmlNodePtr theNode)
     std::list<std::string> aFeatures = importPlugin(aPluginName, aPluginConf);
     std::list<std::string>::iterator it = aFeatures.begin();
     for (; it != aFeatures.end(); it++) {
-      myFeaturesInFiles[*it] = aPluginConf;
+      addFeature(*it, aPluginConf);
     }
   }
 }
@@ -158,12 +173,12 @@ void Config_ModuleReader::loadPlugin(const std::string& thePluginName)
 
 void Config_ModuleReader::loadScript(const std::string& theFileName)
 {
-  /* aquire python thread */
+  /* acquire python thread */
   PyGILState_STATE gstate = PyGILState_Ensure();
 
   PyObject* module = PyImport_ImportModule(theFileName.c_str());
   if (!module) {
-    std::string anErrorMsg = "An error occured while importing " + theFileName;
+    std::string anErrorMsg = "An error occurred while importing " + theFileName;
     //Get detailed error message:
     if (PyErr_Occurred()) {
       PyObject *pstr, *ptype, *pvalue, *ptraceback;