OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1666 CommandFile: Add command and argument name to error messages

Browse Source
This commit is contained in:
Jacob Støren
2017-06-29 16:29:50 +02:00
parent c25895bdad
commit bc0379d246
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CommandFileInterface/Core/RicfObjectCapability.cpp
View File

@@ -74,7 +74,7 @@ void RicfObjectCapability::readFields(QTextStream& inputStream,
if ( currentChar != QChar('=') )
{
// Error message: Missing "=" after argument name
errorMessageContainer->addError("Can't find the '=' after the argument named: \"" + keyword);
errorMessageContainer->addError("Can't find the '=' after the argument named: \"" + keyword + "\" in the command: \"" + errorMessageContainer->currentCommand + "\"" );
fieldDataFound = false;
if (currentChar == QChar(')') )
{
@@ -99,7 +99,7 @@ void RicfObjectCapability::readFields(QTextStream& inputStream,
if ( readFields.count(keyword) )
{
// Warning message: Referenced the same argument several times
errorMessageContainer->addWarning("The argument: \"" + keyword + "\" is referenced several times." );
errorMessageContainer->addWarning("The argument: \"" + keyword + "\" is referenced several times in the command: \"" + errorMessageContainer->currentCommand + "\"" );
}
}
@@ -115,14 +115,16 @@ void RicfObjectCapability::readFields(QTextStream& inputStream,
if ( xmlFieldHandle->isIOReadable() )
{
errorMessageContainer->currentArgument = keyword;
rcfField->readFieldData(inputStream, objectFactory, errorMessageContainer);
errorMessageContainer->currentArgument = keyword;
}
}
else
{
// Error message: Unknown argument name
errorMessageContainer->addWarning("The argument: \"" + keyword + "\" does not exist.");
errorMessageContainer->addWarning("The argument: \"" + keyword + "\" does not exist in the command: \"" + errorMessageContainer->currentCommand + "\"");
}
}