Process validators on the first feature's creation using the Config_ValidatorReader

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

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index 4899fe190ecfc05b38e33a07e3838fa12ea46f33..25d1fdc65c090722c4dddf32bf36ad88068f4cd3 100644 (file)
--- a/src/Config/Config_WidgetReader.cpp
+++ b/src/Config/Config_WidgetReader.cpp
@@ -45,9 +45,9 @@ std::string Config_WidgetReader::featureDescription(const std::string& theFeatur
 void Config_WidgetReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_FEATURE, NULL)) {
-    myCurrentFeature = getProperty(theNode, _ID);
-    myWidgetCache[myCurrentFeature] = dumpNode(theNode);
-    myDescriptionCache[myCurrentFeature] = getProperty(theNode, FEATURE_TEXT);
+    std::string aFeature = getProperty(theNode, _ID);
+    myWidgetCache[aFeature] = dumpNode(theNode);
+    myDescriptionCache[aFeature] = getProperty(theNode, FEATURE_TEXT);
   }
   //Process SOURCE nodes.
   Config_XMLReader::processNode(theNode);
@@ -69,17 +69,16 @@ void Config_WidgetReader::resolveSourceNodes(xmlNodePtr theNode)
     if (isNode(aNode, NODE_SOURCE, NULL)) {
       Config_XMLReader aSourceReader = Config_XMLReader(getProperty(aNode, SOURCE_FILE));
       xmlNodePtr aSourceRoot = aSourceReader.findRoot();
-      if (!aSourceRoot) {
-        continue;
+      if (aSourceRoot) {
+        xmlNodePtr aSourceNode = xmlFirstElementChild(aSourceRoot);
+        xmlNodePtr aTargetNode = xmlDocCopyNodeList(aNode->doc, aSourceNode);
+        while (aTargetNode != NULL) {
+          xmlNodePtr aNextNode = xmlNextElementSibling(aTargetNode);
+          xmlAddPrevSibling(aNode, aTargetNode);
+          aTargetNode = aNextNode;
+        }
+        aSourceNodes.push_back(aNode);
       }
-      xmlNodePtr aSourceNode = xmlFirstElementChild(aSourceRoot);
-      xmlNodePtr aTargetNode = xmlDocCopyNodeList(aNode->doc, aSourceNode);
-      while (aTargetNode != NULL) {
-        xmlNodePtr aNextNode = xmlNextElementSibling(aTargetNode);
-        xmlAddPrevSibling(aNode, aTargetNode);
-        aTargetNode = aNextNode;
-      }
-      aSourceNodes.push_back(aNode);
     }
     aNode = xmlNextElementSibling(aNode);
   }