Author: mukulg
Date: Tue Oct 2 03:34:31 2012
New Revision: 1392722
URL: http://svn.apache.org/viewvc?rev=1392722&view=rev
Log:
committing an improvement, as per latest suggestion in bug report XERCESJ-1585
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties?rev=1392722&r1=1392721&r2=1392722&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
Tue Oct 2 03:34:31 2012
@@ -40,7 +40,8 @@
KeyMatchesNillable = cvc-identity-constraint.4.2.3: Element \"{0}\"
has the key \"{1}\" which matches an element which has nillable set to true.
KeyNotEnoughValues = cvc-identity-constraint.4.2.1.b: Not enough
values specified for <key name=\"{1}\"> identity constraint specified for
element \"{0}\".
KeyNotFound = cvc-identity-constraint.4.3: Key ''{0}'' with value
''{1}'' not found for identity constraint of element ''{2}''.
- KeyRefOutOfScope = Identity Constraint error: identity constraint
\"{0}\" has a keyref which refers to a key or unique that is out of scope.
+ ## KeyRefOutOfScope = Identity Constraint error: identity constraint
\"{0}\" has a keyref which refers to a key or unique that is out of scope.
+ KeyRefOutOfScope = Identity Constraint error: the keyref identity
constraint \"{0}\" refers to a key or unique that is out of scope.
KeyRefReferNotFound = Key reference declaration \"{0}\" refers to
unknown key with name \"{1}\".
UnknownField = Internal identity constraint error; unknown field
\"{0}\" for identity constraint \"{2}\" specified for element \"{1}\".
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1392722&r1=1392721&r2=1392722&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Tue Oct 2 03:34:31 2012
@@ -2757,7 +2757,7 @@ public class XMLSchemaValidator
else if (values != null) {
IdentityConstraint idcConstraint =
values.getIdentityConstraint();
if
(fValueStoreCache.fGlobalIDConstraintMap.get(((KeyRef)idcConstraint).getKey())
== null) {
- reportSchemaError("KeyRefOutOfScope", new
Object[] { idcConstraint.toString() });
+ reportSchemaError("KeyRefOutOfScope", new
Object[] { idcConstraint.getName() });
}
}
@@ -4767,7 +4767,7 @@ public class XMLSchemaValidator
if (fKeyValueStore == null) {
// report error
String code = "KeyRefOutOfScope";
- String value = fIdentityConstraint.toString();
+ String value = fIdentityConstraint.getName();
reportSchemaError(code, new Object[] { value });
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
