Manage selected filters in ContentMergeViewer parts.74/12374/4
commit11e8b9c4b84187567ddefb69e98be7228b039e9b
authorAxel Richard <axel.richard@obeo.fr>
Fri, 26 Apr 2013 15:40:05 +0000 (26 17:40 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Mon, 17 Jun 2013 14:15:55 +0000 (17 16:15 +0200)
tree0b6cf6bfb8bcc8d91ed532e2a04fff0e1f379927
parentc019c32651718e8fcd5154e9f4495f36aab5e62f
Manage selected filters in ContentMergeViewer parts.

Ex. : if the sub-diff filter is enable, no insertion point will be
created for the sub-diff elements and no box will be paint on sub-diffs
If it is disable, insertion point and box will be created and paint.

Change-Id: I53dac31edb31521b11e1533caafb6db105da3dbb
13 files changed:
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/CopyAllNonConflictingCommand.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/LogicalModelTest.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/tree/TreeContentMergeViewer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/IMergeViewer.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractMergeViewer.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableOrTreeMergeViewer.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TreeMergeViewer.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/IMergeViewerItem.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java