sandygao 2003/11/10 13:22:08
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDAbstractTraverser.java
Log:
We were using wrong some error codes.
Revision Changes Path
1.34 +7 -5
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Index: XSDAbstractTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XSDAbstractTraverser.java 25 Sep 2003 22:59:21 -0000 1.33
+++ XSDAbstractTraverser.java 10 Nov 2003 21:22:08 -0000 1.34
@@ -218,7 +218,7 @@
return new XSAnnotationImpl(contentBuffer.toString(), grammar);
} else {
return new XSAnnotationImpl(contents, grammar);
- }
+ }
}
@@ -548,7 +548,9 @@
oneAttrUse.fAttrDecl.getName())) {
String idName = attrGrp.addAttributeUse(oneAttrUse);
if (idName != null) {
- reportSchemaError("cvc-complex-type.5.3", new
Object[]{oneAttrUse.fAttrDecl.getName(), idName}, child);
+ String code = (enclosingCT == null) ?
"ag-props-correct.3" : "ct-props-correct.5";
+ String name = (enclosingCT == null) ? attrGrp.fName :
enclosingCT.getName();
+ reportSchemaError(code, new Object[]{name,
oneAttrUse.fAttrDecl.getName(), idName}, child);
}
}
else {
@@ -619,7 +621,7 @@
((XSSimpleType)typeDecl).getVariety() == XSSimpleType.VARIETY_ATOMIC &&
((XSSimpleType)typeDecl).getPrimitiveKind() ==
XSSimpleType.PRIMITIVE_NOTATION) {
if ((((XSSimpleType)typeDecl).getDefinedFacets() &
XSSimpleType.FACET_ENUMERATION) == 0) {
- reportSchemaError("enumeration-required-notation", new
Object[]{typeDecl.getName(), refName, DOMUtil.getLocalName(elem)}, elem);
+ reportSchemaError("enumeration-required-notation", new
Object[]{typeDecl.getName(), refName, DOMUtil.getLocalName(elem)}, elem);
}
}
}
@@ -669,7 +671,7 @@
if (processingAllEl) {
if (max != 1) {
reportSchemaError("cos-all-limited.2", new Object[]{new
Integer(max),
- ((XSElementDecl)particle.fValue).getName()},
parent);
+ ((XSElementDecl)particle.fValue).getName()},
parent);
max = 1;
if (min > 1)
min = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
