You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/08/27 02:55:38 UTC
cvs commit: xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema StscComplexTypeResolver.java
daveremy 2004/08/26 17:55:38
Modified: v2/src/typeimpl/org/apache/xmlbeans/impl/schema
StscComplexTypeResolver.java
Log:
accidentally added a comment in previous checkin
Contributed by Kevin Krouse
Revision Changes Path
1.7 +5 -3 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
Index: StscComplexTypeResolver.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StscComplexTypeResolver.java 7 Aug 2004 01:31:35 -0000 1.6
+++ StscComplexTypeResolver.java 27 Aug 2004 00:55:38 -0000 1.7
@@ -673,14 +673,16 @@
// recovery: extends ANY_SIMPLE type
baseType = BuiltinSchemaTypeSystem.ST_ANY_SIMPLE;
}
- /*
// BUGBUG: can restrict mixed content as long as all child elements are optional
else if (baseType.getContentType() != SchemaType.SIMPLE_CONTENT)
- state.error("The specified base type " + baseType.toString() + " does not have simple content.", XmlErrorCodes.SIMPLE_BASE_NOT_SIMPLE, parseTree);
+ {
+ // src-ct.2: complex types with simple content can only extend simple types
+ state.error(XmlErrorCodes.SCHEMA_COMPLEX_TYPE$SIMPLE_CONTENT,
+ new Object[] { QNameHelper.pretty(baseType.getName()) } ,
+ parseTree);
// recovery: extends ANY_SIMPLE type
baseType = BuiltinSchemaTypeSystem.ST_ANY_SIMPLE;
}
- */
else if (baseType.getContentType() == SchemaType.MIXED_CONTENT &&
baseType.getContentModel() != null && !baseType.getContentModel().isSkippable())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org