457048: [Model Import] Stereotype/Library repair action sometimes

doesn't propose useful suggestions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=457048

- Fix the duplicate resolution: do not remove all versions of a given
duplicate mapping

1 files changed, 9 insertions, 3 deletions

diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ui/URIMappingDialog.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ui/URIMappingDialog.java
index 968175c4949..687c0296aca 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ui/URIMappingDialog.java
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src/org/eclipse/papyrus/migration/rsa/transformation/ui/URIMappingDialog.java
@@ -197,16 +197,22 @@ public class URIMappingDialog extends SelectionDialog {
 	 */

 	protected void removeDuplicates(List<URIMapping> allMappings) {

 		List<URIMapping> mappingsCopy = new LinkedList<URIMapping>(allMappings);

+

 		for (URIMapping mapping : mappingsCopy) {

 			for (URIMapping m : allMappings) {

 				if (m == mapping) {

 					continue;

 				}

 

+				// This is a duplicate

 				if (mapping.getSourceURI().equals(m.getSourceURI())) {

-					URIMapping mappingToRemove = findLessSpecificMapping(mapping, m);

-					allMappings.remove(mappingToRemove);

-					break;

+					// If both mappings are still present, remove one of them

+					if (allMappings.contains(mapping) && allMappings.contains(m)) {

+						URIMapping mappingToRemove = findLessSpecificMapping(mapping, m);

+

+						allMappings.remove(mappingToRemove);

+						break;

+					}

 				}

 			}

 		}