X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_ValidatorReader.cpp;h=f555b1d6b6139d1914149a794bcf084ec93556b1;hb=b3431dc6aec2a17936648af6eabd3df1a2b2affc;hp=e6b802a59efce057518a2c97b903e1494ca68cc6;hpb=6e421e939851e0de46554ae45a3ca0e1f67cd91d;p=modules%2Fshaper.git diff --git a/src/Config/Config_ValidatorReader.cpp b/src/Config/Config_ValidatorReader.cpp index e6b802a59..f555b1d6b 100644 --- a/src/Config/Config_ValidatorReader.cpp +++ b/src/Config/Config_ValidatorReader.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,8 @@ #include #endif -Config_ValidatorReader::Config_ValidatorReader(const std::string& theXmlFileName) -: Config_XMLReader(theXmlFileName) +Config_ValidatorReader::Config_ValidatorReader(const std::string& theXmlFileName, bool isXMLContent) +: Config_XMLReader(theXmlFileName, isXMLContent) { } @@ -68,7 +68,7 @@ void Config_ValidatorReader::cleanup(xmlNodePtr theNode) } } -bool Config_ValidatorReader::processChildren(xmlNodePtr aNode) +bool Config_ValidatorReader::processChildren(xmlNodePtr /*aNode*/) { return true; } @@ -85,6 +85,8 @@ void Config_ValidatorReader::processValidator(xmlNodePtr theNode) aMessage->setValidatorId(aValidatorId); aMessage->setValidatorParameters(aParameters); std::string aFeatureId = restoreAttribute(NODE_FEATURE, _ID); + if (aFeatureId.length() == 0) + aFeatureId = myExtFeatureId; aMessage->setFeatureId(aFeatureId); // parent is attribute (widget) if (!myCurrentWidget.empty()) {