You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/11/06 19:59:57 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema TraverseSchema.java SchemaMessageProvider.java
neilg 01/11/06 10:59:57
Modified: java/src/org/apache/xerces/msg Tag: xerces_j_1
SchemaMessages.java
java/src/org/apache/xerces/validators/schema Tag: xerces_j_1
TraverseSchema.java SchemaMessageProvider.java
Log:
applying a patch from Neeraj Bajaj <ne...@sun.com> which causes the parser to report an error if a keyref refers to a key with a different number of fields.
Revision Changes Path
No revision
No revision
1.20.2.1 +2 -1 xml-xerces/java/src/org/apache/xerces/msg/Attic/SchemaMessages.java
Index: SchemaMessages.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/msg/Attic/SchemaMessages.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- SchemaMessages.java 2001/07/13 17:53:48 1.20
+++ SchemaMessages.java 2001/11/06 18:59:57 1.20.2.1
@@ -63,7 +63,7 @@
* This file contains error and warning messages for the Schema validator
* The messages are arranged in key and value tuples in a ListResourceBundle.
*
- * @version $Id: SchemaMessages.java,v 1.20 2001/07/13 17:53:48 sandygao Exp $
+ * @version $Id: SchemaMessages.java,v 1.20.2.1 2001/11/06 18:59:57 neilg Exp $
*/
public class SchemaMessages extends ListResourceBundle {
/** The list resource bundle contents. */
@@ -127,6 +127,7 @@
{"Con3X3AttributeAppearance", "Error: constraint 3.x.3: Attribute ''{1}'' cannot appear in element ''{0}''."},
{"Con3X3AttributeMustAppear", "Error: constraint 3.x.3: Attribute ''{1}'' must appear in element ''{0}''."},
{"Con3X3AttributeInvalidValue", "Error: constraint 3.x.3: Invalid attribute value for ''{1}'' in element ''{0}'': {2}."},
+ {"CardinalityNotEqual", "Cardinality of Fields for keyref \"{0}\" and key \"{1}\" must match."},
};
/** Returns the list resource bundle contents. */
No revision
No revision
1.242.2.9 +5 -1 xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/TraverseSchema.java
Index: TraverseSchema.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/TraverseSchema.java,v
retrieving revision 1.242.2.8
retrieving revision 1.242.2.9
diff -u -r1.242.2.8 -r1.242.2.9
--- TraverseSchema.java 2001/11/05 19:49:37 1.242.2.8
+++ TraverseSchema.java 2001/11/06 18:59:57 1.242.2.9
@@ -129,7 +129,7 @@
*
* @see org.apache.xerces.validators.common.Grammar
*
- * @version $Id: TraverseSchema.java,v 1.242.2.8 2001/11/05 19:49:37 neilg Exp $
+ * @version $Id: TraverseSchema.java,v 1.242.2.9 2001/11/06 18:59:57 neilg Exp $
*/
public class TraverseSchema implements
NamespacesScope.NamespacesHandler{
@@ -7417,6 +7417,10 @@
// add to element decl
traverseIdentityConstraint(keyRef, krElem);
+ if(keyRef.getFieldCount() != kId.getFieldCount()){
+ reportSchemaError(SchemaMessageProvider.CardinalityNotEqual, new Object[]{krName,kName});
+ return ;
+ }
// add key reference to element decl
eDecl.keyRef.addElement(keyRef);
1.19.2.1 +3 -1 xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/SchemaMessageProvider.java
Index: SchemaMessageProvider.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/SchemaMessageProvider.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- SchemaMessageProvider.java 2001/06/25 14:47:19 1.19
+++ SchemaMessageProvider.java 2001/11/06 18:59:57 1.19.2.1
@@ -192,9 +192,10 @@
Con3X3AttributeAppearance = 54,
Con3X3AttributeMustAppear = 55,
Con3X3AttributeInvalidValue = 56,
+ CardinalityNotEqual = 57,
// ...
- MSG_MAX_CODE = 57;
+ MSG_MAX_CODE = 58;
//
// Minor Codes
//
@@ -260,6 +261,7 @@
"Con3X3AttributeAppearance",
"Con3X3AttributeMustAppear",
"Con3X3AttributeInvalidValue",
+ "CardinalityNotEqual",
// END
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org