e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e - emfcompare/org.eclipse.emf.compare

commit: e249f7f4ef4fbfa75f5f7bcfb407784a2bbe1d7e
[log] [tgz]
author: Axel Richard <axel.richard@obeo.fr>
Tue May 21 17:55:05 2013 +0200
committer: Mikaël Barbero <mikael.barbero@obeo.fr>
Thu Jun 27 22:18:44 2013 +0200
tree: 82277280e364cdf5920ceed406b973605b3e3467
parent: 68a39767bef4abb768055e6fc0b33618438fb620 [diff]

[398361] Enhanced Model Merge UI

- Add new Ruler next to StructureMergeViewer
- When select diff in StructureMergeViewer, highlight required and
unmergeable diffs,
and create annotations in Ruler
- Add new merge and navigation actions in StructureMergeViewer toolbar.
- Delete old merge and navigation actions in ContentMergeViewer toolbar.

Bug: 398361
Change-Id: I3d43fe9c4938404361f835e93631ed744a2c4377

plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.edit/icons/full/ovr16/merged_left_ov.gif[Added - diff]
plugins/org.eclipse.emf.compare.edit/icons/full/ovr16/merged_right_ov.gif[Added - diff]
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/accept_all_changes.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/accept_change.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/left_to_right.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_all_to_left.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_all_to_right.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_to_left.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/merge_to_right.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/next_diff.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/prev_diff.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/reject_all_changes.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/reject_change.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/right_to_left.gif[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/plugin.properties[diff]
plugins/org.eclipse.emf.compare.ide.ui/plugin.xml[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/expand/ExpandAllModelAction.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractViewerWrapper.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareDiffTreeRuler.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareDiffTreeViewer.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java[diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractAcceptRejectAllChanges.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractAcceptRejectChange.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractMergedAllTo.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AbstractMergedTo.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AcceptAllChanges.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/AcceptChange.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownHandler.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownLeftToRight.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/DropDownRightToLeft.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedAllToLeft.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedAllToRight.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedToLeft.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/MergedToRight.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/RejectAllChanges.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/RejectChange.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SelectNextDiff.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SelectPreviousDiff.java[Added - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/AcceptRejectChangePropertyTester.java[Copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java[Copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/LeftToRightSidePropertyTester.java[Copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/MergedToPropertyTester.java[Copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/ModelSaveablePropertyTester.java[Renamed from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/RightToLeftSidePropertyTester.java[Copied from plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java - diff]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/util/EMFCompareUIHandlerUtil.java[Added - diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/EMFCompareConstants.java[diff]
plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java[diff]
plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/DiffMergeDataAdapter.java[Added - diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IDiffMergeData.java[Added - diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java[diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java[diff]
plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java[diff]

61 files changed

tree: 82277280e364cdf5920ceed406b973605b3e3467