neilg 2002/08/26 07:46:47
Modified: java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xs/identity Field.java
Log:
reverting change where content validated by xs:anyType would be exposed in the
schemaNormalizedValue property of the PSVI. Also, identity constraints will no longer
validate such elements.
Revision Changes Path
1.86 +1 -5
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.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- XMLSchemaValidator.java 23 Aug 2002 22:52:07 -0000 1.85
+++ XMLSchemaValidator.java 26 Aug 2002 14:46:47 -0000 1.86
@@ -2955,10 +2955,6 @@
reportSchemaError("cvc-complex-type.2.3", new
Object[]{element.rawname});
}
}
- else if (ctype == SchemaGrammar.fAnyType) {
- fCurrentPSVI.fNormalizedValue = textContent;
- actualValue = textContent;
- }
// 2.4 If the {content type} is element-only or mixed, then the
sequence of the element information item's element information item [children], if
any, taken in order, is valid with respect to the {content type}'s particle, as
defined in Element Sequence Locally Valid (Particle) (3.9.4).
if (ctype.fContentType == XSComplexTypeDecl.CONTENTTYPE_ELEMENT ||
ctype.fContentType == XSComplexTypeDecl.CONTENTTYPE_MIXED) {
1.7 +1 -8
xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Field.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Field.java 23 Aug 2002 22:52:07 -0000 1.6
+++ Field.java 26 Aug 2002 14:46:47 -0000 1.7
@@ -243,13 +243,6 @@
val = (XSSimpleType)(type);
}
}
- // REVISIT: special case to handle elements with xs:anyType.
- // This probably is not valid; need clarification from WG. - NG
- if(val == null && type == SchemaGrammar.fAnyType ) {
- // REVISIT: this is why anyType shouldn't
- // match fields!
- val =
(XSSimpleType)SchemaGrammar.SG_SchemaNS.getGlobalTypeDecl(SchemaSymbols.ATTVAL_STRING);
- }
}
if(val == null ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
