[514079] Default to TextMergeViewer resources for icons/labels/tooltips25/93725/2
commit0b9bb74d1af822dd06a77b66ef5af101ef29af3f
authorMartin Fleck <mfleck@eclipsesource.com>
Wed, 22 Mar 2017 14:43:31 +0000 (22 15:43 +0100)
committerLaurent Goubet <laurent.goubet@obeo.fr>
Tue, 9 May 2017 14:08:48 +0000 (9 10:08 -0400)
treeb7ce2b88adae974b22e0e979dbfe32265521d2d4
parent237891798f6e45ea75fc67a8ed2728fc7fe6fd9a
[514079] Default to TextMergeViewer resources for icons/labels/tooltips

- Wrap the resource bundle of an EMF Compare content merge viewer to
default to the Eclipse Compare TextMergeViewer resources for any
non-defined key to avoid re-definition problems, e.g., different values
on different platforms.

- Remove defined, identical key-value pairs for toolbar actions from the
properties of the content merge viewers.

Bug: 514079
Change-Id: I9e17bebc2ff16f830cc4812ba16acca274d773fb
Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/contentmergeviewer/PapyrusTreeContentMergeViewer.properties
plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.properties
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/EMFCompareContentMergeViewerResourceBundle.java [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.properties
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.properties
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties