Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-04-25 07:32:01 -0400
committerlgoubet2019-04-25 07:32:01 -0400
commitba64d7324277e7d947491c969cd1e66c2a4d9af0 (patch)
treea711d4cbd52689a1daa19cc3edc8bc9ccc204581
parentd2f51867b94fbd32268ee9bcc4a04a7045a9ee2a (diff)
downloadorg.eclipse.emf.compare-ba64d7324277e7d947491c969cd1e66c2a4d9af0.tar.gz
org.eclipse.emf.compare-ba64d7324277e7d947491c969cd1e66c2a4d9af0.tar.xz
org.eclipse.emf.compare-ba64d7324277e7d947491c969cd1e66c2a4d9af0.zip
Prevent duplicate insertion points to be shown in tree viewers3.3.7M4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/provider/TreeMergeViewerItemContentProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/provider/TreeMergeViewerItemContentProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/provider/TreeMergeViewerItemContentProvider.java
index 523eca58d..2ddb4b231 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/provider/TreeMergeViewerItemContentProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/provider/TreeMergeViewerItemContentProvider.java
@@ -448,7 +448,7 @@ public class TreeMergeViewerItemContentProvider implements IMergeViewerItemConte
*/
private List<Diff> collectDifferences(Comparison comparison, Iterable<Object> objects) {
List<Diff> differences = StreamSupport.stream(objects.spliterator(), false)
- .filter(EObject.class::isInstance).map(EObject.class::cast)
+ .filter(EObject.class::isInstance).map(EObject.class::cast).distinct()
.flatMap(eobject -> comparison.getDifferences(eobject).stream()).collect(Collectors.toList());
return differences;
}

Back to the top