Public Git Hosting - EMFCompare2.git/commit

commit	2f639210b1a82189d84f160e87fc3d9a1e0c250b
author	Philip Langer <planger@eclipsesource.com>
	Wed, 22 Nov 2017 13:39:09 +0000 (22 14:39 +0100)
committer	Laurent Goubet <laurent.goubet@obeo.fr>
	Tue, 11 Dec 2018 10:34:05 +0000 (11 05:34 -0500)
tree	a5242b7a19bb5198640f88b77567a43b071acb63	tree \| snapshot (tar.gz zip)
parent	745ca4b14982b775fa250f66acb886f08d08869d	commit \| diff

[527567] Provide support for a general property merge viewer

Adds and registers Property Content Merge Viewer for all input types.

Bug: 527567
Change-Id: Ic4654bbfaf6557dafc18b3bc8499711439cd314a
Signed-off-by: Philip Langer <planger@eclipsesource.com>

21 files changed:

plugins/org.eclipse.emf.compare.diagram.ide.ui/plugin.xml		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/show_advanced_properties.png	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/show_categories.png	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/plugin.xml		diff \| blob \| blame \| history
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/ColumnResizer.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/DiffPropertyItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyAccessor.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyCategoryItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewer.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewer.properties	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyContentMergeViewerCreator.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyDescriptorItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyListElementItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyTreeMergeViewer.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyTreeViewer.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/PropertyValuePlaceholderItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/ResourcePropertyDescriptor.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/property/RootPropertyItem.java	[new file with mode: 0644]	blob
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties		diff \| blob \| blame \| history

Eclipse foundation framework to comapre EMF models

RSS Atom