[402536] Merge sub diffs when filter "Sub diffs elements" is active.96/10896/4
commitc8c4ba55f5e6f0628fa41a22a6df3dd7ebe46ec3
authorAxel Richard <axel.richard@obeo.fr>
Wed, 6 Mar 2013 10:53:51 +0000 (6 11:53 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Mon, 11 Mar 2013 15:46:01 +0000 (11 11:46 -0400)
treefd3fb47e8e15e28f31ea2ac9d06510395813b8dd
parent25cd174359204b77eb639cd5287732159c352791
[402536] Merge sub diffs when filter "Sub diffs elements" is active.

When the filter "Sub diff elements" is active, the sub diffs are hidden.
So, when we merge a diff, if this diff contains sub diffs, these sub
diffs should also merged. Moreover, these sub diffs are maybe required
by or requires diffs. These diffs may contain sub diffs that should also
be merged.

Bug: 402536

Change-Id: Ibec057bb9ab43f0484a1fcf317b9c0c59a95446e
plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/CopyCommand.java
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/ICompareEditingDomain.java
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java
plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java