| commit | ba64d7324277e7d947491c969cd1e66c2a4d9af0 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Thu Apr 25 13:32:01 2019 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Thu Apr 25 13:32:01 2019 +0200 |
| tree | a711d4cbd52689a1daa19cc3edc8bc9ccc204581 | |
| parent | d2f51867b94fbd32268ee9bcc4a04a7045a9ee2a [diff] |
Prevent duplicate insertion points to be shown in tree viewers Change-Id: I85b1f3fa57042034c78c5bd30abf5607b3f5acc6
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 523eca5..2ddb4b2 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 @@ */ 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; }