X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=2b024061a5335aa2ee405d36c6ddaca7726516e1;hb=e9f48e35e26dfce648e2f6ecbe1e43c51ba32a7e;hp=adf8f5e7abb8623d3edc81e1f442ec2393ef7835;hpb=8e45fc95efaf00a22e223ecbba721e30b5a17f4b;p=modules%2Fshaper.git

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index adf8f5e7a..2b024061a 100644
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -76,22 +76,26 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
           const char* kWdgCase = hasParent(theNode, WDG_SWITCH_CASE, NULL)
                                  ? WDG_SWITCH_CASE
                                  : WDG_TOOLBOX_BOX;
+          const char* kWdgSwitch = hasParent(theNode, WDG_SWITCH_CASE, NULL)
+                                   ? WDG_SWITCH
+                                   : WDG_TOOLBOX;
           aMessage->setCaseId(restoreAttribute(kWdgCase, _ID));
+          aMessage->setSwitchId(restoreAttribute(kWdgSwitch, _ID));
         }
         Events_Loop::loop()->send(aMessage);
       }
     // container pages, like "case" or "box"
-    } else if (isCaseNode(theNode)) {
+    } else if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
       storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
     }
   }
-  //Process SOURCE, VALIDATOR nodes.
+  //Process SOURCE nodes.
   Config_XMLReader::processNode(theNode);
 }
 
 void Config_FeatureReader::cleanup(xmlNodePtr theNode)
 {
-  if (isCaseNode(theNode)) {
+  if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
     // cleanup id of cases when leave case node
     cleanupAttribute(theNode, _ID);
   }
@@ -135,49 +139,3 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
   }
   outFeatureMessage->setDocumentKind(aDocKind);
 }
-
-void Config_FeatureReader::storeAttribute(xmlNodePtr theNode,
-                                          const char* theNodeAttribute)
-{
-  std::string aKey = getNodeName(theNode) + ":" + std::string(theNodeAttribute);
-  std::string aValue = getProperty(theNode, theNodeAttribute);
-  if(!aValue.empty()) {
-    myParentAttributes[aKey] = aValue;
-  }
-}
-
-std::string Config_FeatureReader::restoreAttribute(xmlNodePtr theNode,
-                                                   const char* theNodeAttribute)
-{
-  return restoreAttribute(getNodeName(theNode).c_str(), theNodeAttribute);
-}
-std::string Config_FeatureReader::restoreAttribute(const char* theNodeName,
-                                                   const char* theNodeAttribute)
-{
-  std::string aKey = std::string(theNodeName) + ":" + std::string(theNodeAttribute);
-  std::string result = "";
-  if(myParentAttributes.find(aKey) != myParentAttributes.end()) {
-    result = myParentAttributes[aKey];
-  }
-  return result;
-}
-
-bool Config_FeatureReader::cleanupAttribute(xmlNodePtr theNode,
-                                            const char* theNodeAttribute)
-{
-  return cleanupAttribute(getNodeName(theNode).c_str(), theNodeAttribute);
-}
-
-bool Config_FeatureReader::cleanupAttribute(const char* theNodeName,
-                                            const char* theNodeAttribute)
-{
-  std::string aKey = std::string(theNodeName) + ":" + std::string(theNodeAttribute);
-  bool result = false;
-  std::map<std::string, std::string>::iterator anEntry = myParentAttributes.find(aKey);
-  if( anEntry != myParentAttributes.end()) {
-    myParentAttributes.erase(anEntry);
-    result = true;
-  }
-  return result;
-}
-