From ba64d7324277e7d947491c969cd1e66c2a4d9af0 Mon Sep 17 00:00:00 2001
From: lgoubet
Date: Thu, 25 Apr 2019 13:32:01 +0200
Subject: Prevent duplicate insertion points to be shown in tree viewers

Change-Id: I85b1f3fa57042034c78c5bd30abf5607b3f5acc6
---
 .../tree/provider/TreeMergeViewerItemContentProvider.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 	}
-- 
cgit v1.2.3