diff options
| author | lgoubet | 2011-08-05 16:52:54 +0000 |
|---|---|---|
| committer | lgoubet | 2011-08-08 08:42:19 +0000 |
| commit | 0442b9f8f83bf7f2d622b1f2fd0b159e71032f29 (patch) | |
| tree | 6c49cf1a7febed621d496dd586f3f70c98fd0ea0 | |
| parent | d2e019780e29b7482381fbdbb721bb2e04f9fca4 (diff) | |
| download | org.eclipse.emf.compare-0442b9f8f83bf7f2d622b1f2fd0b159e71032f29.tar.gz org.eclipse.emf.compare-0442b9f8f83bf7f2d622b1f2fd0b159e71032f29.tar.xz org.eclipse.emf.compare-0442b9f8f83bf7f2d622b1f2fd0b159e71032f29.zip | |
Potentially merging duplicates with eOpposites
| -rw-r--r-- | plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/EMFCompareEObjectCopier.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/EMFCompareEObjectCopier.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/EMFCompareEObjectCopier.java index 004488d07..d999ba30d 100644 --- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/EMFCompareEObjectCopier.java +++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/merge/EMFCompareEObjectCopier.java @@ -212,10 +212,12 @@ public class EMFCompareEObjectCopier extends org.eclipse.emf.ecore.util.EcoreUti } else { final List<Object> targetList = (List<Object>)referenceValue; - if (index > -1 && index < targetList.size()) { - targetList.add(index, copy); - } else { - targetList.add(copy); + if (!targetList.contains(copy)) { + if (index > -1 && index < targetList.size()) { + targetList.add(index, copy); + } else { + targetList.add(copy); + } } } } else { |