sandygao 2003/01/21 09:54:35 Modified: java/src/org/apache/xerces/impl/msg XMLSchemaMessages.properties java/src/org/apache/xerces/impl/xs/traversers XSDElementTraverser.java Log: Error code change as per Erratum E1-36. Revision Changes Path 1.61 +3 -3 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.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- XMLSchemaMessages.properties 21 Jan 2003 17:51:04 -0000 1.60 +++ XMLSchemaMessages.properties 21 Jan 2003 17:54:35 -0000 1.61 @@ -231,8 +231,8 @@ enumeration-valid-restriction = enumeration-valid-restriction: enumeration value ''{0}'' is not in the value space of '{'base type definition'}'. e-props-correct.1 = e-props-correct.1: error. e-props-correct.2 = e-props-correct.2: Invalid value constraint value ''{1}'' in element ''{0}''. - e-props-correct.3 = e-props-correct.3: The '{'type definition'}' of element ''{0}'' must be validly derived from the '{'type definition'}' of the substitutionHead ''{1}''. - e-props-correct.4 = e-props-correct.4: There must not be a '{'value constraint'}' on element ''{0}'', because its '{'type definition'}' or '{'type definition'}'''s '{'content type'}' is or is derived from ID. + e-props-correct.4 = e-props-correct.4: The '{'type definition'}' of element ''{0}'' must be validly derived from the '{'type definition'}' of the substitutionHead ''{1}''. + 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 or is derived from ID. e-props-correct.6 = e-props-correct.6: Circular substitution group detected for element ''{0}''. fractionDigits-totalDigits = fractionDigits-totalDigits: fractionDigits value = ''{0}'' must be <= totalDigits value = ''{1}''. length-minLength-maxLength = length-minLength-maxLength: It is an error for both length and either of minLength or maxLength to be specified. 1.21 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java Index: XSDElementTraverser.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- XSDElementTraverser.java 16 Jan 2003 18:37:36 -0000 1.20 +++ XSDElementTraverser.java 21 Jan 2003 17:54:35 -0000 1.21 @@ -449,7 +449,7 @@ // 3 If there is an {substitution group affiliation}, the {type definition} of the element declaration must be validly derived from the {type definition} of the {substitution group affiliation}, given the value of the {substitution group exclusions} of the {substitution group affiliation}, as defined in Type Derivation OK (Complex) (3.4.6) (if the {type definition} is complex) or as defined in Type Derivation OK (Simple) (3.14.6) (if the {type definition} is simple). if (element.fSubGroup != null) { if (!XSConstraints.checkTypeDerivationOk(element.fType, element.fSubGroup.fType, element.fSubGroup.fFinal)) { - reportSchemaError ("e-props-correct.3", new Object[]{nameAtt, subGroupAtt.prefix+":"+subGroupAtt.localpart}, elmDecl); + reportSchemaError ("e-props-correct.4", new Object[]{nameAtt, subGroupAtt.prefix+":"+subGroupAtt.localpart}, elmDecl); } } @@ -459,7 +459,7 @@ ((XSSimpleType)elementType).isIDType()) || (elementType.getTypeCategory() == XSTypeDefinition.COMPLEX_TYPE && ((XSComplexTypeDecl)elementType).containsTypeID())) { - reportSchemaError ("e-props-correct.4", new Object[]{element.fName}, elmDecl); + reportSchemaError ("e-props-correct.5", new Object[]{element.fName}, elmDecl); } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]