sandygao 2003/06/18 10:05:00
Modified: java/src/org/apache/xerces/impl/dv/xs XSSimpleTypeDecl.java
java/src/org/apache/xerces/impl/msg
XMLSchemaMessages.properties
Log:
Schema erratum E2-13: it's an error for fraction digits in the derived type to be
greater than that in the base type.
Revision Changes Path
1.38 +6 -2
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
Index: XSSimpleTypeDecl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- XSSimpleTypeDecl.java 18 Jun 2003 15:16:51 -0000 1.37
+++ XSSimpleTypeDecl.java 18 Jun 2003 17:04:59 -0000 1.38
@@ -1223,11 +1223,15 @@
}
}
+ // check 4.3.12.c2 error: fractionDigits > fBase.fractionDigits
// check fixed value for fractionDigits
if (((fFacetsDefined & FACET_FRACTIONDIGITS) != 0)) {
if ((( fBase.fFacetsDefined & FACET_FRACTIONDIGITS) != 0)) {
if ((fBase.fFixedFacet & FACET_FRACTIONDIGITS) != 0 &&
fFractionDigits != fBase.fFractionDigits) {
- reportError("FixedFacetValue", new
Object[]{"fractionDigits", Integer.toString(fFractionDigits), Integer.toString(
fBase.fFractionDigits), fTypeName});
+ reportError("FixedFacetValue", new
Object[]{"fractionDigits", Integer.toString(fFractionDigits),
Integer.toString(fBase.fFractionDigits), fTypeName});
+ }
+ if (fFractionDigits > fBase.fFractionDigits) {
+ reportError( "fractionDigits-valid-restriction", new
Object[]{Integer.toString(fFractionDigits), Integer.toString(fBase.fFractionDigits),
fTypeName});
}
}
}
1.69 +3 -2
xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
Index: XMLSchemaMessages.properties
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- XMLSchemaMessages.properties 18 Jun 2003 15:16:51 -0000 1.68
+++ XMLSchemaMessages.properties 18 Jun 2003 17:04:59 -0000 1.69
@@ -187,8 +187,9 @@
e-props-correct.4 = e-props-correct.4: The '{'type definition'}' of element
''{0}'' is not validly derived from the '{'type definition'}' of the substitutionHead
''{1}'', or the {substitution group exclusions} property of ''{1}'' does not allowed
this derivation.
e-props-correct.5 = e-props-correct.5: There must not be a '{'value
constraint'}' on element ''{0}'', because its '{'type definition'}' or '{'type
definition'}'''s '{'content type'}' is ID, or is derived from ID.
e-props-correct.6 = e-props-correct.6: Circular substitution group detected
for element ''{0}''.
+ fractionDigits-valid-restriction = fractionDigits-valid-restriction: In the
definition of {2}, the value ''{0}'' for the facet ''fractionDigits'' is invalid,
because it must be <= the value for ''fractionDigits'' which was set to ''{1}'' in one
of the ancestor types.
fractionDigits-totalDigits = fractionDigits-totalDigits: In the definition
of {2}, the value ''{0}'' for the facet ''fractionDigits'' is invalid, because it must
be <= the value for ''totalDigits'' which is ''{1}''.
- length-minLength-maxLength.a = length-minLength-maxLength.a: It is an error
for both length and either of minLength or maxLength to be specified. However, {0} has
length = ''{1}'', minLength = ''{2}'' and maxLength = ''{3}''.
+ length-minLength-maxLength.a = length-minLength-maxLength.a: It is an error
for both length and either of minLength or maxLength to be specified. However, {0} has
length = ''{1}'', minLength = ''{2}'' and maxLength = ''{3}''.
length-minLength-maxLength.b = length-minLength-maxLength.b: It is an error
for both length and either of minLength or maxLength to be specified. However, {0} has
length = ''{1}'' and minLength = ''{2}''.
length-minLength-maxLength.c = length-minLength-maxLength.c: It is an error
for both length and either of minLength or maxLength to be specified. However, {0} has
length = ''{1}'' and maxLength = ''{2}''.
length-valid-restriction = length-valid-restriction: Error for type
''{2}''. The value of length = ''{0}'' must be = the value of that of the base type
''{1}''.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
