commit 32a96f988b9b3f2a5123188b5c2d85260701047a
author Ed Merks <ed.merks@gmail.com> Sun Jan 06 10:56:17 2013 +0100
committer Ed Merks <ed.merks@gmail.com> Sun Jan 06 10:56:17 2013 +0100
tree adf3a451f4d991f205893233e2d937f4bf4b1900
parent 4259c4e57ce1a30a004d313a4f89c20dea960e61

[397348] Eliminate duplicate union member types.

features/org.eclipse.xsd-feature/feature.xml

diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index bdf986e..2cf6cad 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd"
       label="%featureName"
-      version="2.8.0.qualifier"
+      version="2.8.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.xsd.license"

features/org.eclipse.xsd.sdk-feature/feature.xml

diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index a7936a6..ae4d17e 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.sdk"
       label="%featureName"
-      version="2.8.1.qualifier"
+      version="2.8.2.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.xsd.license"

plugins/org.eclipse.xsd/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index 7a1f39b..d2c519a 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd; singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName

plugins/org.eclipse.xsd/release.digest

diff --git a/plugins/org.eclipse.xsd/release.digest b/plugins/org.eclipse.xsd/release.digest
index 4dea047..bd1b9c1 100644
--- a/plugins/org.eclipse.xsd/release.digest
+++ b/plugins/org.eclipse.xsd/release.digest
Binary files differ

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);
+                }
               }
             }
           }