You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2010/04/27 18:11:11 UTC
svn commit: r938543 -
/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
Author: cezar
Date: Tue Apr 27 16:11:11 2010
New Revision: 938543
URL: http://svn.apache.org/viewvc?rev=938543&view=rev
Log:
Fix for XMLBEANS-414 contributed by Radu Preotiuc.
Modified:
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java?rev=938543&r1=938542&r2=938543&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java Tue Apr 27 16:11:11 2010
@@ -453,8 +453,9 @@ public class StscComplexTypeResolver
Map attributePropertyModel = buildAttributePropertyModelByQName(attrModel, sImpl);
// compute empty/element/mixed
- int complexVariety = (contentModel == null ? SchemaType.EMPTY_CONTENT :
- (mixed ? SchemaType.MIXED_CONTENT : SchemaType.ELEMENT_CONTENT));
+ // fix for XMLBEANS-414
+ int complexVariety = (mixed ? SchemaType.MIXED_CONTENT :
+ (contentModel == null ? SchemaType.EMPTY_CONTENT : SchemaType.ELEMENT_CONTENT));
// now fill in the actual schema type implementation
sImpl.setBaseTypeRef(baseType.getRef());
@@ -1169,11 +1170,11 @@ public class StscComplexTypeResolver
{
// http://www.w3.org/TR/xmlschema-1/#element-complexContent::extension
- // 2.1 If the ·explicit content· is empty, then the {content type} of the type definition ·resolved· to by the ·actual value· of the base [attribute]
+ // 2.1 If the explicit content is empty, then the {content type} of the type definition resolved to by the �actual value� of the base [attribute]
if (extendedContentModel == null)
return baseContentModel;
- // 2.2 If the type definition ·resolved· to by the ·actual value· of the base [attribute] has a {content type} of empty, then a pair of mixed or elementOnly (determined as per clause 1.2.1 above) and the ·explicit content· itself;
+ // 2.2 If the type definition resolved to by the actual value of the base [attribute] has a {content type} of empty, then a pair of mixed or elementOnly (determined as per clause 1.2.1 above) and the explicit content itself;
if (baseContentModel == null)
return extendedContentModel;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org