neilg 2002/08/27 12:45:02
Modified: java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
java/src/org/apache/xerces/impl/msg
XMLSchemaMessages.properties
Log:
adding message relating to identity constraint validation. Also fixing bug#11840
Revision Changes Path
1.88 +3 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- XMLSchemaValidator.java 26 Aug 2002 18:31:37 -0000 1.87
+++ XMLSchemaValidator.java 27 Aug 2002 19:45:02 -0000 1.88
@@ -3483,7 +3483,8 @@
String code = "KeyNotFound";
String value = toString(values);
String element = fIdentityConstraint.getElementName();
- reportSchemaError(code, new Object[]{value,element});
+ String name = fIdentityConstraint.getName();
+ reportSchemaError(code, new Object[]{name, value,element});
}
}
1.53 +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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- XMLSchemaMessages.properties 9 Aug 2002 15:14:05 -0000 1.52
+++ XMLSchemaMessages.properties 27 Aug 2002 19:45:02 -0000 1.53
@@ -22,7 +22,7 @@
FixedDiffersFromActual = The content of this element is not equivalent to
the value of the \"fixed\" attribute in the element's declaration in the schema.
KeyMatchesNillable = Identity Constraint error
(cvc-identity-constraint.4.2.3): element \"{0}\" has a key which matches an element
which has nillable set to true.
KeyNotEnoughValues = Not enough values specified for <key name=\"{1}\">
identity constraint specified for element \"{0}\".
- KeyNotFound = Key with value [{0}] not found for identity constraint of
element \"{1}\".
+ KeyNotFound = Key ''{0}'' with value ''{1}'' not found for identity
constraint of element ''{2}''.
KeyRefNotEnoughValues = Not enough values specified for <keyref
name=\"{1}\"> identity constraint specified for element \"{0}\".
KeyRefOutOfScope = Identity Constraint error: identity constraint \"{0}\"
has a keyref which refers to a key or unique that is out of scope.
KeyRefReferNotFound = Key reference declaration \"{0}\" refers to unknown
key with name \"{1}\".
@@ -79,6 +79,7 @@
cvc-fractionDigits-valid = cvc-fractionDigits-valid: Value ''{0}'' with
fractionDigits = ''{1}'' is not facet-valid with respect to fractionDigits ''{2}''.
cvc-id.1 = cvc-id.1: There is no ID/IDREF binding for IDREF ''{0}''.
cvc-id.2 = cvc-id.2: There are multiple occurrences of ID value ''{0}''.
+ cvc-id.3 = cvc-id.3: A field of identity constraint ''{0}'' matched element
''{1}'' but this element does not have a simple type.
cvc-identity-constraint = cvc-identity-constraint: error.
cvc-length-valid = cvc-length-valid: Value ''{0}'' with length = ''{1}'' is
not facet-valid with respect to length ''{2}''.
cvc-maxExclusive-valid = cvc-maxExclusive-valid: Value ''{0}'' is not
facet-valid with respect to maxExclusive ''{1}''.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
