?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: d8af5fa) | patch
[501569] The cascading filter does not hide merged cascading diffs07/83607/3
commit99e8fb56b9bab8f8f58ba0b766b0b5e7132b9d6f
authorAxel Richard <axel.richard@obeo.fr>
Thu, 20 Oct 2016 15:32:04 +0000 (20 17:32 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Fri, 21 Oct 2016 07:24:51 +0000 (21 09:24 +0200)
treecf3c043cdd40da81322cc823577d3f37b1a04a68tree | snapshot (tar.gz zip)
parentd8af5faeb2bff1a0658af54957deb7012c7e4b0ccommit | diff
[501569] The cascading filter does not hide merged cascading diffs

Add new adapter (MatchOfContainmentDiffAdapter) to Matches related to
containment diff.
Use this adapter to fix bug 501569 on the cascading filter.

Bug: 501569
Change-Id: Ie07bf3be141b656ca53f526960cdb1ff9cf0b2f4
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/match/MatchOfContainmentReferenceChangeAdapterTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/match/data/MatchOfContainmentReferenceChangeAdapterTestData.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/match/data/left.ecore [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/match/data/right.ecore [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/match/MatchOfContainmentReferenceChangeProcessor.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/MatchOfContainmentReferenceChangeAdapter.java [new file with mode: 0644] blob
Eclipse foundation framework to comapre EMF models