neeraj 2003/05/29 06:25:42
Modified: java/src/org/apache/xerces/impl
XML11DocumentScannerImpl.java
XMLDocumentFragmentScannerImpl.java
XMLNSDocumentScannerImpl.java
XMLNamespaceBinder.java XMLScanner.java
java/src/org/apache/xerces/impl/dtd XMLNSDTDValidator.java
java/src/org/apache/xerces/impl/msg XMLMessages.properties
Log:
Committing the patch for bug 17294. Lot of thanks to Venu for providing patches to
long pending issue.
Revision Changes Path
1.10 +4 -4
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XML11DocumentScannerImpl.java 8 May 2003 20:11:54 -0000 1.9
+++ XML11DocumentScannerImpl.java 29 May 2003 13:25:41 -0000 1.10
@@ -374,7 +374,7 @@
// quote
int quote = fEntityScanner.peekChar();
if (quote != '\'' && quote != '"') {
- reportFatalError("OpenQuoteExpected", new Object[]{atName});
+ reportFatalError("OpenQuoteExpected", new Object[]{eleName,atName});
}
fEntityScanner.scanChar();
@@ -502,7 +502,7 @@
}
else if (c == '<') {
reportFatalError("LessthanInAttValue",
- new Object[] { null, atName });
+ new Object[] { eleName, atName });
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
@@ -569,7 +569,7 @@
// quote
int cquote = fEntityScanner.scanChar();
if (cquote != quote) {
- reportFatalError("CloseQuoteExpected", new Object[]{atName});
+ reportFatalError("CloseQuoteExpected", new Object[]{eleName,atName});
}
} // scanAttributeValue()
1.33 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
Index: XMLDocumentFragmentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XMLDocumentFragmentScannerImpl.java 8 May 2003 20:11:54 -0000 1.32
+++ XMLDocumentFragmentScannerImpl.java 29 May 2003 13:25:41 -0000 1.33
@@ -855,7 +855,7 @@
fEntityScanner.skipSpaces();
if (!fEntityScanner.skipChar('=')) {
reportFatalError("EqRequiredInAttribute",
- new Object[]{fAttributeQName.rawname});
+ new
Object[]{fCurrentElement.rawname,fAttributeQName.rawname});
}
fEntityScanner.skipSpaces();
1.15 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
Index: XMLNSDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLNSDocumentScannerImpl.java 8 May 2003 20:11:54 -0000 1.14
+++ XMLNSDocumentScannerImpl.java 29 May 2003 13:25:41 -0000 1.15
@@ -266,7 +266,7 @@
if (uri == null) {
fErrorReporter.reportError(XMLMessageFormatter.XMLNS_DOMAIN,
"AttributePrefixUnbound",
- new Object[]{aprefix,
fAttributeQName.rawname},
+ new
Object[]{fElementQName.rawname,fAttributeQName.rawname,aprefix},
XMLErrorReporter.SEVERITY_FATAL_ERROR);
}
fAttributes.setURI(i, uri);
@@ -364,7 +364,7 @@
fEntityScanner.skipSpaces();
if (!fEntityScanner.skipChar('=')) {
reportFatalError("EqRequiredInAttribute",
- new Object[]{fAttributeQName.rawname});
+ new
Object[]{fCurrentElement.rawname,fAttributeQName.rawname});
}
fEntityScanner.skipSpaces();
1.29 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLNamespaceBinder.java
Index: XMLNamespaceBinder.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNamespaceBinder.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XMLNamespaceBinder.java 8 May 2003 20:11:54 -0000 1.28
+++ XMLNamespaceBinder.java 29 May 2003 13:25:41 -0000 1.29
@@ -813,7 +813,7 @@
if (fAttributeQName.uri == null) {
fErrorReporter.reportError(XMLMessageFormatter.XMLNS_DOMAIN,
"AttributePrefixUnbound",
- new Object[]{aprefix, arawname},
+ new
Object[]{element.rawname,arawname,aprefix},
XMLErrorReporter.SEVERITY_FATAL_ERROR);
}
attributes.setName(i, fAttributeQName);
1.32 +4 -4 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLScanner.java 8 May 2003 20:11:54 -0000 1.31
+++ XMLScanner.java 29 May 2003 13:25:41 -0000 1.32
@@ -733,7 +733,7 @@
// quote
int quote = fEntityScanner.peekChar();
if (quote != '\'' && quote != '"') {
- reportFatalError("OpenQuoteExpected", new Object[]{atName});
+ reportFatalError("OpenQuoteExpected", new
Object[]{eleName,atName});
}
fEntityScanner.scanChar();
@@ -861,7 +861,7 @@
}
else if (c == '<') {
reportFatalError("LessthanInAttValue",
- new Object[] { null, atName });
+ new Object[]
{ eleName, atName });
fEntityScanner.scanChar();
if (entityDepth == fEntityDepth) {
fStringBuffer2.append((char)c);
@@ -925,7 +925,7 @@
// quote
int cquote = fEntityScanner.scanChar();
if (cquote != quote) {
- reportFatalError("CloseQuoteExpected", new Object[]{atName});
+ reportFatalError("CloseQuoteExpected", new
Object[]{eleName,atName});
}
} // scanAttributeValue()
1.6 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java
Index: XMLNSDTDValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLNSDTDValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLNSDTDValidator.java 16 Dec 2002 01:26:20 -0000 1.5
+++ XMLNSDTDValidator.java 29 May 2003 13:25:42 -0000 1.6
@@ -211,7 +211,7 @@
if (fAttributeQName.uri == null) {
fErrorReporter.reportError(XMLMessageFormatter.XMLNS_DOMAIN,
"AttributePrefixUnbound",
- new Object[]{aprefix, arawname},
+ new
Object[]{element.rawname,arawname,aprefix},
XMLErrorReporter.SEVERITY_FATAL_ERROR);
}
attributes.setName(i, fAttributeQName);
1.20 +5 -5
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLMessages.properties 7 Apr 2003 05:31:22 -0000 1.19
+++ XMLMessages.properties 29 May 2003 13:25:42 -0000 1.20
@@ -48,9 +48,9 @@
ETagRequired = The element type \"{0}\" must be terminated by the matching
end-tag \"</{0}>\".
# 3.1 Start-Tags, End-Tags, and Empty-Element Tags
ElementUnterminated = Element type \"{0}\" must be followed by either
attribute specifications, \">\" or \"/>\".
- EqRequiredInAttribute = Attribute name \"{0}\" must be followed by the '' =
'' character.
- OpenQuoteExpected = Open quote is expected for attribute \"{0}\".
- CloseQuoteExpected = Close quote is expected for attribute \"{0}\".
+ EqRequiredInAttribute = Attribute name \"{1}\" associated with an element
type \"{0}\" must be followed by the '' = '' character.
+ OpenQuoteExpected = Open quote is expected for attribute \"{1}\" associated
with an element type \"{0}\".
+ CloseQuoteExpected = Close quote is expected for attribute \"{1}\"
associated with an element type \"{0}\".
AttributeNotUnique = Attribute \"{1}\" was already specified for element
\"{0}\".
AttributeNSNotUnique = Attribute \"{1}\" bound to namespace \"{2}\" was
already specified for element \"{0}\".
ETagUnterminated = The end-tag for element type \"{0}\" must end with a
''>'' delimiter.
@@ -72,7 +72,7 @@
InvalidCharInTextDecl = An invalid XML character (Unicode: 0x{0}) was found
in the text declaration.
# 2.3 Common Syntactic Constructs
QuoteRequiredInAttValue = The value of attribute \"{1}\" must begin with
either a single or double quote character.
- LessthanInAttValue = The value of attribute \"{1}\" must not contain the
''<'' character.
+ LessthanInAttValue = The value of attribute \"{1}\" associated with an
element type \"{0}\" must not contain the ''<'' character.
AttributeValueUnterminated = The value for attribute \"{1}\" must end with
the matching quote character.
# 2.5 Comments
InvalidCommentStart = Comment must start with \"<!--\".
@@ -264,7 +264,7 @@
IllegalQName = Element or attribute do not match QName production:
QName::=(NCName':')?NCName.
ElementXMLNSPrefix = Element \"{0}\" cannot have \"xmlns\" as its prefix.
ElementPrefixUnbound = The prefix \"{0}\" for element \"{1}\" is not bound.
- AttributePrefixUnbound = The prefix \"{0}\" for attribute \"{1}\" is not
bound.
+ AttributePrefixUnbound = The prefix \"{2}\" for attribute \"{1}\"
associated with an element type \"{0}\" is not bound.
EmptyPrefixedAttName = The value of the attribute \"{0}\" is invalid.
Prefixed namespace bindings may not be empty.
PrefixDeclared = The namespace prefix \"{0}\" was not declared.
CantBindXMLNS = The prefix "xmlns" cannot be bound to any namespace
explicitly; neither can the namespace for "xmlns" be bound to any prefix explicitly.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
