?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 9c40dc6) | patch
big revamp of the ide.ui code to support some corner cases elegantly
commit3d8ed1b0c4523bbe5d3293c7cd2b1dccac7290a7
authorMikaël Barbero <mikael.barbero@obeo.fr>
Fri, 24 Aug 2012 15:35:49 +0000 (24 17:35 +0200)
committerMikaël Barbero <mikael.barbero@obeo.fr>
Fri, 24 Aug 2012 15:35:49 +0000 (24 17:35 +0200)
treef5527b7e76ad6de677c81fa011ecb4984546d127tree | snapshot (tar.gz zip)
parent9c40dc6ea70c13551aec69e45f1cc9e29f3bd7bdcommit | diff
big revamp of the ide.ui code to support some corner cases elegantly
(diff on unmatch object).
18 files changed:
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/BasicMergeViewerItemImpl.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/IMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/IMergeViewerItem.java [copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/IStructuralFeatureAccessor.java with 58% similarity] diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/InsertionPoint.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/MatchedObject.java [copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/IStructuralFeatureAccessor.java with 52% similarity] diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/AbstractDiffAccessor.java [deleted file] blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/AttributeChangeAccessor.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/BasicStructuralAccessorImpl.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/IStructuralFeatureAccessor.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/ReferenceChangeAccessor.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewerContentProvider.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeMergeViewer.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/MatchUtil.java [new file with mode: 0644] blob
Eclipse foundation framework to comapre EMF models