svn commit: r440715 - in /webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema: SchemaBuilder.java XmlSchemaSerializer.java

[dims]

Author: dims
Date: Wed Sep  6 06:58:12 2006
New Revision: 440715

URL: http://svn.apache.org/viewvc?view=rev&rev=440715
Log:
Fix serialization for the following union snippet

        <simpleType name="countType">
                <union memberTypes="nonNegativeInteger">
                        <simpleType>
                                <restriction base="string">
                                        <enumeration value="all"/>
                                </restriction>
                        </simpleType>
                </union>
        </simpleType>



Modified:
    
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
    
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java

Modified: 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?view=diff&rev=440715&r1=440714&r2=440715
==============================================================================
--- 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
 (original)
+++ 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
 Wed Sep  6 06:58:12 2006
@@ -461,7 +461,9 @@
 
                 union.baseTypes.add(unionSimpleType);
 
-                union.memberTypesSource += " " + unionSimpleType.name;
+                if(unionSimpleType.name != null) {
+                    union.memberTypesSource += " " + unionSimpleType.name;
+                }
 
                 inlineUnionType =
                         XDOMUtil.getNextSiblingElementNS(inlineUnionType,

Modified: 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?view=diff&rev=440715&r1=440714&r2=440715
==============================================================================
--- 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
 (original)
+++ 
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
 Wed Sep  6 06:58:12 2006
@@ -1340,7 +1340,7 @@
         if (unionObj.memberTypesSource != null)
             union.setAttribute("memberTypes",
                     unionObj.memberTypesSource);
-        else if (unionObj.baseTypes.getCount() > 0) {
+        if (unionObj.baseTypes.getCount() > 0) {
             int baseTypesLength = unionObj.baseTypes.getCount();
             Element baseType;
             for (int i = 0; i < baseTypesLength; i++) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]