d325b970d36639ffe791c1190601e75af19006c9 - diffmerge/org.eclipse.emf.diffmerge.core

commit	d325b970d36639ffe791c1190601e75af19006c9	[log] [tgz]
author	Olivier Constant <olivier.constant@thalesgroup.com>	Thu Oct 17 18:19:11 2019 +0200
committer	Olivier Constant <olivier.constant@thalesgroup.com>	Thu Oct 17 18:19:11 2019 +0200
tree	0b301e3fe64617f9be0a6c2b5b7e5bd3646744cd
parent	2d833752203d848b1776b796a0372d8ab3f876c9 [diff]

Bug 544000 - Make EDM applicable to non-EMF data

- Renamed all E* in generic as G*

Change-Id: If3bd0e1e66052e4669acaa523783a609a6198754
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>

plugins/org.eclipse.emf.diffmerge.generic/model/GDiffData.ecore[diff]
plugins/org.eclipse.emf.diffmerge.generic/model/GDiffData.genmodel[diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GAttributeValuePresence.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EAttributeValuePresence.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GComparison.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparison.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GComparisonElement.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparisonElement.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GElementPresence.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementPresence.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GElementRelativePresence.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementRelativePresence.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GIdentified.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EIdentified.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GMapping.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMapping.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GMatch.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMatch.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GMergeableDifference.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMergeableDifference.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GReferenceValuePresence.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EReferenceValuePresence.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GValuePresence.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EValuePresence.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataPackage.java[diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GAttributeValuePresenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EAttributeValuePresenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GComparisonImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EComparisonImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GElementPresenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementPresenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GElementRelativePresenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementRelativePresenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GIdentifiedImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EIdentifiedImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GMappingImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMappingImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GMatchImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMatchImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GMergeableDifferenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMergeableDifferenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GReferenceValuePresenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EReferenceValuePresenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GValuePresenceImpl.java[Renamed from plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EValuePresenceImpl.java - diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataPackageImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataAdapterFactory.java[diff]
plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataSwitch.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.diffmerge.pojo/model/POJODiffData.ecore[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EAttributeValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EComparison.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EComparisonElement.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EElementPresence.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EElementRelativePresence.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EMapping.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EMatch.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EMergeableDifference.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EReferenceValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/EValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/PojodiffdataPackage.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EAttributeValuePresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EComparisonImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EElementPresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EMappingImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EMatchImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/EReferenceValuePresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/impl/PojodiffdataPackageImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/util/PojodiffdataAdapterFactory.java[diff]
plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/pojodiffdata/util/PojodiffdataSwitch.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.diffmerge.ui/model/DiffUIData.ecore[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java[diff]
plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java[diff]
plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparisonElement.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java[diff]
plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java[diff]

80 files changed

tree: 0b301e3fe64617f9be0a6c2b5b7e5bd3646744cd