commit c860d460e73dab7cdcfefe8ce4a37b751273cb4d
author Ed Merks <ed.merks@gmail.com> Thu Jan 03 09:47:19 2013 +0100
committer Ed Merks <ed.merks@gmail.com> Thu Jan 03 09:47:19 2013 +0100
tree 568397761f3a74b81b57a5168327dcebd34639ba
parent b4a9baad2ec519a3139f8786244a5416e9d36773

[397348] Eliminate duplicate union member types.

plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java

diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
index 63123f0..db5f3ca 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
@@ -700,7 +700,14 @@
                 resolveSimpleTypeDefinition(theMemberTypeDefinition.getTargetNamespace(), theMemberTypeDefinition.getName());
               if ((forceResolve || newMemberTypeDefinition.getContainer() != null) && newMemberTypeDefinition != theMemberTypeDefinition)
               {
-                theMemberTypeDefinitions.set(newMemberTypeDefinition);
+                if (memberTypeDefinitions.contains(newMemberTypeDefinition))
+                {
+                  theMemberTypeDefinitions.remove();
+                }
+                else
+                {
+                  theMemberTypeDefinitions.set(newMemberTypeDefinition);
+                }
               }
             }
           }