X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_ValidatorReader.cpp;h=e15dfb2ad09f875f36dca575681386a20c82afe3;hb=81baa77e52cb1ade2bfbe5b21e893cc34b03c323;hp=ccb3090115e2d8c8bd085765b716374d467ef504;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/Config/Config_ValidatorReader.cpp b/src/Config/Config_ValidatorReader.cpp index ccb309011..e15dfb2ad 100644 --- a/src/Config/Config_ValidatorReader.cpp +++ b/src/Config/Config_ValidatorReader.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 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 @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -34,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) { } @@ -69,7 +68,7 @@ void Config_ValidatorReader::cleanup(xmlNodePtr theNode) } } -bool Config_ValidatorReader::processChildren(xmlNodePtr aNode) +bool Config_ValidatorReader::processChildren(xmlNodePtr /*aNode*/) { return true; } @@ -86,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()) {