ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/XmlTools2/trunk/xmlpatch.cpp

Comparing XmlTools2/trunk/xmlpatch.cpp (file contents):
Revision 954 by s10k, Mon Feb 10 14:28:14 2014 UTC vs.
Revision 955 by iritscen, Tue Feb 11 17:08:41 2014 UTC

#	Line 81 | Line 81 | void XmlPatch::insertNodesOperation(cons
81		QString errMessage;
82
83		if(xPathExpression.isEmpty()){
84	<	errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
84	>	errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
85		if(filters.getParentElementName()!=""){
86		errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
87		}
#	Line 90 | Line 90 | void XmlPatch::insertNodesOperation(cons
90		}
91		}
92		else{
93	<	errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
93	>	errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
94		}
95
96		UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES",errMessage);
#	Line 142 | Line 142 | void XmlPatch::removeNodesOperation(XmlF
142		QString errMessage;
143
144		if(xPathExpression.isEmpty()){
145	<	errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
145	>	errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
146		if(filters.getParentElementName()!=""){
147		errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
148		}
#	Line 151 | Line 151 | void XmlPatch::removeNodesOperation(XmlF
151		}
152		}
153		else{
154	<	errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
154	>	errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
155		}
156
157		UtilXmlTools::displayErrorMessage("@REMOVE_NODES",errMessage);
#	Line 370 | Line 370 | void XmlPatch::checkAndProcessValidComma
370		UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option or XPathExpression option is required.");
371		}
372		else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
373	<	UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
373	>	UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
374		}
375		if(filters.getAttributeName()!="" && filters.getAttributeValue()==""){
376		UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","AttributeValue option is required if using AttributeName option.");
#	Line 415 | Line 415 | void XmlPatch::checkAndProcessValidComma
415		UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option or XPathExpression option is required.");
416		}
417		else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
418	<	UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
418	>	UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
419		}
420
421		if(filters.getAttributeName()!="" && filters.getAttributeValue()==""){
#	Line 498 | Line 498 | QString XmlPatch::getPatchParameterValue
498		}
499		parameter.remove(" "); // just remove the space added so it doesn't look weird when outputted to the user
500
501	<	UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retreive '" + parameter + "' parameter.");
501	>	UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retrieve '" + parameter + "' parameter.");
502		}
503
504		startValueIdx=line.indexOf(parameter); // get the position where parameter is defined

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)