X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_ValidatorReader.cpp;h=f555b1d6b6139d1914149a794bcf084ec93556b1;hb=b3431dc6aec2a17936648af6eabd3df1a2b2affc;hp=442cf5042828e1706169e5a7c2029788ca3bc6a5;hpb=b24899c5ff113144ea6498484e6f20da8d6f773e;p=modules%2Fshaper.git diff --git a/src/Config/Config_ValidatorReader.cpp b/src/Config/Config_ValidatorReader.cpp index 442cf5042..f555b1d6b 100644 --- a/src/Config/Config_ValidatorReader.cpp +++ b/src/Config/Config_ValidatorReader.cpp @@ -1,11 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * Config_ValidatorReader.cpp - * - * Created on: Mar 20, 2015 - * Author: sbh - */ +// 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -23,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) { } @@ -58,7 +68,7 @@ void Config_ValidatorReader::cleanup(xmlNodePtr theNode) } } -bool Config_ValidatorReader::processChildren(xmlNodePtr aNode) +bool Config_ValidatorReader::processChildren(xmlNodePtr /*aNode*/) { return true; } @@ -75,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()) {