neeraj 2003/04/06 22:31:22
Modified: java/src/org/apache/xerces/impl
XML11DocumentScannerImpl.java XMLScanner.java
java/src/org/apache/xerces/impl/msg XMLMessages.properties
Log:
Changing the parameter order while calling and in error messages as suggested by
Glenn. We should take care of it in future too so as the standard of " all attribute
errors have the element name as the {0} parameter and the
attribute name as the {1} parameter and any *additional*
parameters occur after these. " is maintained.
Revision Changes Path
1.6 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
Index: XML11DocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XML11DocumentScannerImpl.java 3 Apr 2003 10:58:48 -0000 1.5
+++ XML11DocumentScannerImpl.java 7 Apr 2003 05:31:21 -0000 1.6
@@ -564,7 +564,7 @@
}
else if (c != -1 && XML11Char.isXML11Invalid(c)) {
reportFatalError("InvalidCharInAttValue",
- new Object[] {Integer.toString(c,
16),atName,eleName});
+ new Object[] {eleName, atName,
Integer.toString(c, 16)});
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
1.29 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XMLScanner.java 3 Apr 2003 10:58:48 -0000 1.28
+++ XMLScanner.java 7 Apr 2003 05:31:21 -0000 1.29
@@ -903,7 +903,7 @@
}
else if (c != -1 && isInvalidLiteral(c)) {
reportFatalError("InvalidCharInAttValue",
- new Object[]
{Integer.toString(c, 16),atName,eleName});
+ new Object[] {eleName, atName,
Integer.toString(c, 16)});
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
1.19 +1 -1
xml-xerces/java/src/org/apache/xerces/impl/msg/XMLMessages.properties
Index: XMLMessages.properties
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLMessages.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLMessages.properties 3 Apr 2003 10:58:49 -0000 1.18
+++ XMLMessages.properties 7 Apr 2003 05:31:22 -0000 1.19
@@ -65,7 +65,7 @@
# Messages common to Document and DTD
# 2.2 Characters
- InvalidCharInAttValue = An invalid XML character (Unicode: 0x{0}) was found
in the value of attribute \"{1}\" and element is \"{2}\".
+ InvalidCharInAttValue = An invalid XML character (Unicode: 0x{2}) was found
in the value of attribute \"{1}\" and element is \"{0}\".
InvalidCharInComment = An invalid XML character (Unicode: 0x{0}) was found
in the comment.
InvalidCharInPI = An invalid XML character (Unicode: 0x{0}) was found in
the processing instruction.
InvalidCharInInternalSubset = An invalid XML character (Unicode: 0x{0}) was
found in the internal subset of the DTD.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
