Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 08:56:53 +0000
committerOlivier Constant2018-09-07 14:02:16 +0000
commitf5683739559038156728caa0dfe5587a10b000f4 (patch)
tree5071bfc7a9479498fd65ebf5fe045962aae6ea38 /plugins
parentf7462bf1d5a65c9c80ba884b2bce391a89b7a08d (diff)
downloadorg.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.gz
org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.xz
org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.zip
Bug 535213 - Switch to EPL-2.0
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/EMFDiffMergeCoreConnectorPlugin.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/Messages.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractRevisionScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/EMFDiffMergeCompareViewerCreator.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/TeamComparisonViewer.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/URIConvertingScopeDefinition.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/EMFDiffMergeGitConnectorPlugin.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/Messages.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitConflictURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitCommitURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexOursURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexTheirsURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitRevisionScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffMergePlugin.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMergePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/Messages.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/about.html28
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffMergePlugin.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/about.html31
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityBasedStructure.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityTester.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IProperty.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IPropertyValue.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IStructureWithProperties.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/PropertyValue.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Relations.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Structures.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/AbstractBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashInvertibleBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IRangedBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/TypeRestrictedBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractMapQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashInvertibleQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IRangedQBinaryRelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FArrayList.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashMap.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashSet.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FLinkedList.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FOrderedSet.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableArrayList.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableHashMap.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableLinkedList.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeMap.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeSet.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/IComparableStructure.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelationIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractIterableEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractRecursivelyDefinedEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/BreadthFirstIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingInvertibleEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CompositeEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/DepthFirstIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableInvertibleEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICachingEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICompositeEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IGraphIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IIterableEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRangedEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRecursivelyDefinedEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/RecursivelyDefinedEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/TypeAdaptedEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingInvertibleQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableInvertibleQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/ICachingQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IIterableQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRangedQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRecursivelyDefinedQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/RecursivelyDefinedQEndorelation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/CachingImpact.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpact.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpactRule.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impact.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/ImpactRule.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impacts.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/InvertibleImpact.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethod.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethodFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeLabelProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeUIPlugin.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/Messages.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/about.html28
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml15
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/Messages.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethod.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethodFactory.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeLabelProvider.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeUIPlugin.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDifferenceCategoryProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusScopeDefinitionFactory.java19
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusTechnicalDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/messages.properties11
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/EMFDiffMergeUIPlugin.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/Messages.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/ComparisonSelection.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataPackage.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/MatchAndFeature.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/ComparisonSelectionImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchAndFeatureImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchToNbEntryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataAdapterFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataSwitch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/AbstractLogEvent.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/CompareLogEvent.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/DiffMergeLogger.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/MergeLogEvent.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/AbstractComparisonSetup.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareEditorAdapterFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareModelsAction.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetup.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizard.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizardPage.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ModelScopeTypedElement.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinition.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethodFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinition.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IOverridableFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ITimestampProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/AbstractComparisonMethod.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ComparisonConfiguration.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethodFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigureComparisonDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethod.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethodFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinition.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinition.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinition.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinitionFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/CompositeUndoContext.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DefaultDiffLabelDecorator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DelegatingLabelProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffDecoratingLabelProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffLabelDecorator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeLabelProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DifferenceKind.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/GitLikeDiffLabelDecorator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IDiffLabelDecorator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IUserPropertyOwner.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/InconsistencyDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/MiscUtil.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/SymmetricMatchComparer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UIUtil.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserProperty.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserPropertyOwner.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/AbstractComparisonViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonSideViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonTreeViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultDifferenceCategoryProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultUserProperties.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DirectedComparisonViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonSideViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonTreeViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedFeaturesViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedValuesViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/HeaderViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IComparisonSideViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryItem.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryProvider.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategorySet.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceRelatedViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoiceData.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoicesDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoiceData.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoicesDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactMessageDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ModelScopeViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/SelectionBridge.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextCompareContent.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextMergerDialog.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategoryItem.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractSideRelatedDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ConflictCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/DifferenceCategorySet.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/IgnoredDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MergedDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MoveCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/OrderDifferenceCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/PropertyChangeCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ThreeWayOriginCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/about.html51
-rw-r--r--plugins/org.eclipse.emf.diffmerge/build.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore9
-rw-r--r--plugins/org.eclipse.emf.diffmerge/model/DiffData.genmodel9
-rw-r--r--plugins/org.eclipse.emf.diffmerge/plugin.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/EMFDiffMergePlugin.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/Messages.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IEditableModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFeaturedModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFragmentedModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/AttributeToValueToDifferenceEntryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementRelativePresenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMergeableDifferenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EValuePresenceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ElementToDifferenceEntryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ReferenceToElementToDifferenceEntryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ValueToDifferenceEntryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceFactoryImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceImpl.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/AbstractExpensiveOperation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/BidirectionalComparisonCopier.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/DiffOperation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MatchOperation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MergeOperation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/UnidirectionalComparisonCopier.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/AbstractConfigurationElement.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/CachingMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ComparisonConfigurator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableDiffPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMergePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultDiffPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMergePolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/MapBasedMatchPolicy.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractEditableModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/DynamicUniqueListIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FilteredModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/ModelScopeIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/MultiResourceTreeIterator.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/RootedModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/SubtreeModelScope.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/messages.properties9
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/IExpensiveOperation.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelImplUtil.java17
-rw-r--r--plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelsUtil.java17
378 files changed, 2669 insertions, 3539 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/about.html b/plugins/org.eclipse.emf.diffmerge.connector.core/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties
index 795ff703..37790b87 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties
index ceca7c7b..ef16a7de 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Local history and Core Connector Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml
index abaced6b..7bea899f 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml
@@ -2,10 +2,11 @@
<?eclipse version="3.4"?>
<!--
Copyright (c) 2015-2018 Intel Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/EMFDiffMergeCoreConnectorPlugin.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/EMFDiffMergeCoreConnectorPlugin.java
index 415e7265..57d8f367 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/EMFDiffMergeCoreConnectorPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/EMFDiffMergeCoreConnectorPlugin.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/Messages.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/Messages.java
index 60859b98..882c18e4 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/Messages.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractRevisionScopeDefinitionFactory.java
index e38f630e..3ded583c 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractRevisionScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractRevisionScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
index c00ee7ba..1ecc70d8 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/EMFDiffMergeCompareViewerCreator.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/EMFDiffMergeCompareViewerCreator.java
index b05cf66c..293e553e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/EMFDiffMergeCompareViewerCreator.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/EMFDiffMergeCompareViewerCreator.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryScopeDefinitionFactory.java
index ea612a8c..e8da6c8f 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryURIConverter.java
index fd6ea673..fd0e6a2b 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/LocalHistoryURIConverter.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/TeamComparisonViewer.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/TeamComparisonViewer.java
index ccf32730..1231e126 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/TeamComparisonViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/TeamComparisonViewer.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/URIConvertingScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/URIConvertingScopeDefinition.java
index 8e2924ec..13202a12 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/URIConvertingScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/URIConvertingScopeDefinition.java
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/messages.properties b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/messages.properties
index e02f1d79..3a2a504e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
LocalHistoryModelScopeDefinitionFactory_RevisionLabel=Local history: %1$s %2$s
AbstractRevisionScopeDefinitionFactory_Label=File revision in history
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/about.html b/plugins/org.eclipse.emf.diffmerge.connector.git/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.git/build.properties
index 795ff703..37790b87 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.properties
index 90316939..f4831f71 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Git Connector Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.xml
index 1f1e9e97..350c5e0a 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/plugin.xml
@@ -2,10 +2,11 @@
<?eclipse version="3.4"?>
<!--
Copyright (c) 2015-2018 Intel Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/EMFDiffMergeGitConnectorPlugin.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/EMFDiffMergeGitConnectorPlugin.java
index f03d108e..855401d1 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/EMFDiffMergeGitConnectorPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/EMFDiffMergeGitConnectorPlugin.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/Messages.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/Messages.java
index d0ad3d66..d28140de 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/Messages.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitConflictURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitConflictURIConverter.java
index 65e6f7aa..4941a29e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitConflictURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitConflictURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitURIConverter.java
index 7d55bbe7..846e9c6e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/AbstractGitURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitCommitURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitCommitURIConverter.java
index 22e5305c..864b83eb 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitCommitURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitCommitURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
index 8b1d64e8..89834b83 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexOursURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexOursURIConverter.java
index 252ede45..f56037e7 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexOursURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexOursURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
index 44aa1404..13da856b 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexTheirsURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexTheirsURIConverter.java
index 5dadadde..084ecc9e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexTheirsURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexTheirsURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexURIConverter.java
index b665c985..0f6a1b04 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitRevisionScopeDefinitionFactory.java
index 579be4bf..adc90d32 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitRevisionScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitRevisionScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/messages.properties b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/messages.properties
index cda80fde..66df9143 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2018 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
AbstractGitURIConverter_CannotFindResource=Cannot find IResource at: %s
GitHelper_NoConflictInfoFound=Cannot find conflict information for resource at: %s
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
index bd8e0cf4..d900be15 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.team.core,
org.eclipse.team.svn.ui
Export-Package: org.eclipse.emf.diffmerge.connector.svn,
org.eclipse.emf.diffmerge.connector.svn.ext
+Automatic-Module-Name: org.eclipse.emf.diffmerge.connector.svn
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html b/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties
index f9fd2458..e4f6a876 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2017 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties
index f96bd214..f1ac7419 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2017 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Subversion Connector Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml
index 72b283a9..91e2483c 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml
@@ -2,10 +2,11 @@
<?eclipse version="3.4"?>
<!--
Copyright (c) 2015-2017 Intel Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java
index 1597268b..79b99a02 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java
index 73dbc37b..b02e49ef 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java
index db7c401c..60b8122a 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java
index c2f04460..50b4f4dc 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java
index ba6bc9bc..c2bdb00a 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java
index 7de04c35..32d2a70e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015-2017 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties
index 20c4c28e..49dc5224 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2015-2017 Intel Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
SVNHistoryURIConverter_CannotLoad=Cannot load resource: %s
SVNHistoryURIConverter_CannotLoad_Located=Cannot load resource at: %s
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/about.html b/plugins/org.eclipse.emf.diffmerge.gmf/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/build.properties b/plugins/org.eclipse.emf.diffmerge.gmf/build.properties
index 8a6d7cdc..00bea1ae 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties
index af855786..3e1e1d43 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = GMF Diff/Merge Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffMergePlugin.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffMergePlugin.java
index 337360e3..bd23fe12 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffMergePlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffMergePlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import org.eclipse.core.runtime.Plugin;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffPolicy.java
index 72201d26..974d9795 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFDiffPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMatchPolicy.java
index ccc62b88..cf2b7033 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMatchPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMatchPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMergePolicy.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMergePolicy.java
index 340617df..b7f3c130 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMergePolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFMergePolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import java.util.Set;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFScope.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFScope.java
index cbc3b402..9f9b50c6 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFScope.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/GMFScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/Messages.java b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/Messages.java
index 021c2111..ad447f2d 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/Messages.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.gmf;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/messages.properties b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/messages.properties
index c82398b1..8ec108e9 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/src/org/eclipse/emf/diffmerge/gmf/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
GMFMatchPolicy_Criterion_RepresentedElement=Diagrams: Match shapes according to represented elements
GMFMatchPolicy_Criterion_RepresentedElement_Tooltip=Match shapes (graphical nodes or edges) which represent the same element in the same diagram.\nBeware that it only makes sense if an element cannot be represented by different shapes in the same diagram.
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/about.html b/plugins/org.eclipse.emf.diffmerge.sirius/about.html
index 420ad0f9..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/about.html
@@ -1,27 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html -->
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2006</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-
-</body></html> \ No newline at end of file
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/build.properties b/plugins/org.eclipse.emf.diffmerge.sirius/build.properties
index 74db17a5..d042aeea 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2006-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties b/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties
index c4931a4c..3b32579b 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2006-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Sirius Diff/Merge Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffMergePlugin.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffMergePlugin.java
index 454c80ef..0bab70ec 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffMergePlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffMergePlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.sirius;
import org.eclipse.core.runtime.Plugin;
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java
index b3763991..b83eb08a 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.sirius;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
index 74332e82..b17b3dd8 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.sirius;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java
index b3d053ad..5905b4aa 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.sirius;
import java.util.Set;
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
index a7d1f985..362b59bc 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.sirius;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/about.html b/plugins/org.eclipse.emf.diffmerge.structures/about.html
index c9aa9153..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.structures/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-</head><body lang="EN-US">
+</head>
+<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/build.properties b/plugins/org.eclipse.emf.diffmerge.structures/build.properties
index 5e180099..b6ee6877 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.structures/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2017-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
bin.includes = .,\
META-INF/,\
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties b/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties
index aacb8b2b..6db05eb6 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2017-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Structures Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityBasedStructure.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityBasedStructure.java
index a0f05bd8..e2470e98 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityBasedStructure.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityBasedStructure.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityTester.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityTester.java
index 6871d591..68c5daed 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityTester.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IEqualityTester.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IProperty.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IProperty.java
index 9bc695f7..0e03ad61 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IProperty.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IProperty.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IPropertyValue.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IPropertyValue.java
index ed6c7124..ac5ee171 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IPropertyValue.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IPropertyValue.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IStructureWithProperties.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IStructureWithProperties.java
index dd653529..1715d1bf 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IStructureWithProperties.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/IStructureWithProperties.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/PropertyValue.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/PropertyValue.java
index af3b134b..975f7b2a 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/PropertyValue.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/PropertyValue.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
/**
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Relations.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Relations.java
index 41ec5b11..f0e53b7e 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Relations.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Relations.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Structures.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Structures.java
index 5275b945..711f59f9 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Structures.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/Structures.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures;
import java.util.Iterator;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/AbstractBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/AbstractBinaryRelation.java
index 06568895..4d6844a2 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/AbstractBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/AbstractBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import static org.eclipse.emf.diffmerge.structures.PropertyValue.unknownValue;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashBinaryRelation.java
index 2babe615..9618d57c 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import static org.eclipse.emf.diffmerge.structures.Relations.rangedIsFunctional;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashInvertibleBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashInvertibleBinaryRelation.java
index a650ee32..a9b3ad32 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashInvertibleBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/HashInvertibleBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import static org.eclipse.emf.diffmerge.structures.Relations.rangedIsInjective;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IBinaryRelation.java
index 9223b62b..ec510d53 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IRangedBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IRangedBinaryRelation.java
index d8e7a842..b18e36e0 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IRangedBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/IRangedBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2016 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/TypeRestrictedBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/TypeRestrictedBinaryRelation.java
index ee4b9d49..9ff018ea 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/TypeRestrictedBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/TypeRestrictedBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary;
import static org.eclipse.emf.diffmerge.structures.PropertyValue.unknownValue;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractMapQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractMapQBinaryRelation.java
index e05461c6..2059c80f 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractMapQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractMapQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractQBinaryRelation.java
index 048aa8f0..9993e79a 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/AbstractQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import static org.eclipse.emf.diffmerge.structures.Relations.qualifiedCopyInto;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashInvertibleQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashInvertibleQBinaryRelation.java
index 5bddda17..60f03b7f 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashInvertibleQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashInvertibleQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import static org.eclipse.emf.diffmerge.structures.Relations.rangedIsInjective;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashQBinaryRelation.java
index 5898851e..5c3a4ede 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/HashQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import static org.eclipse.emf.diffmerge.structures.Relations.qualifiedCopyInto;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IQBinaryRelation.java
index e8f9ea99..7ebd2568 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IRangedQBinaryRelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IRangedQBinaryRelation.java
index 43264ede..3e17db51 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IRangedQBinaryRelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/binary/qualified/IRangedQBinaryRelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.binary.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FArrayList.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FArrayList.java
index 19d43653..df4ebd04 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FArrayList.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FArrayList.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashMap.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashMap.java
index 57592b3d..7afbf469 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashMap.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashMap.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashSet.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashSet.java
index 53d6b313..31a63848 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashSet.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FHashSet.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common;
import java.util.AbstractSet;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FLinkedList.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FLinkedList.java
index 7b97e75d..7e670b1d 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FLinkedList.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FLinkedList.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FOrderedSet.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FOrderedSet.java
index f7e347e5..e30ce5e3 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FOrderedSet.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/FOrderedSet.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableArrayList.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableArrayList.java
index ac1cc94c..aa779119 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableArrayList.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableArrayList.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableHashMap.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableHashMap.java
index 34cdbf31..e3ecf92b 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableHashMap.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableHashMap.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableLinkedList.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableLinkedList.java
index fab5ddf0..1a999ab8 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableLinkedList.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableLinkedList.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeMap.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeMap.java
index b213d171..7e8d00df 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeMap.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeMap.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Iterator;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeSet.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeSet.java
index b8ee31f4..aabd0d54 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeSet.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/ComparableTreeSet.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/IComparableStructure.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/IComparableStructure.java
index 3b7e5125..88f012a7 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/IComparableStructure.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/common/comparable/IComparableStructure.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.common.comparable;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelation.java
index 09583c71..4ac4ae5e 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import static org.eclipse.emf.diffmerge.structures.PropertyValue.unknownValue;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelationIterator.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelationIterator.java
index eebe9f5d..34b873fa 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelationIterator.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractEndorelationIterator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractIterableEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractIterableEndorelation.java
index 9964f4bb..1432ebe1 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractIterableEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractIterableEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import static org.eclipse.emf.diffmerge.structures.PropertyValue.unknownValue;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractRecursivelyDefinedEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractRecursivelyDefinedEndorelation.java
index b33224cc..c18a7196 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractRecursivelyDefinedEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/AbstractRecursivelyDefinedEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import static org.eclipse.emf.diffmerge.structures.PropertyValue.unknownValue;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/BreadthFirstIterator.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/BreadthFirstIterator.java
index 5a2d7a9c..d1a7c8ec 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/BreadthFirstIterator.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/BreadthFirstIterator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingEndorelation.java
index bfd7d9e8..d9f424fa 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingInvertibleEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingInvertibleEndorelation.java
index 26f56e9d..a3d43297 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingInvertibleEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CachingInvertibleEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CompositeEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CompositeEndorelation.java
index 9b4efee7..b5bdaf8b 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CompositeEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/CompositeEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import static org.eclipse.emf.diffmerge.structures.Relations.qualifiedGet;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/DepthFirstIterator.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/DepthFirstIterator.java
index 209ce874..26979934 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/DepthFirstIterator.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/DepthFirstIterator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableEndorelation.java
index 5ef3b459..7e310a21 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableInvertibleEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableInvertibleEndorelation.java
index 94cddea7..17f62832 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableInvertibleEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/EditableInvertibleEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICachingEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICachingEndorelation.java
index 300209f6..914e5d63 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICachingEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICachingEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICompositeEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICompositeEndorelation.java
index fefb388e..f6409f16 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICompositeEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/ICompositeEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IEndorelation.java
index 9a452ac0..f365de50 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IGraphIterator.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IGraphIterator.java
index 8b288707..42d5258d 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IGraphIterator.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IGraphIterator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IIterableEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IIterableEndorelation.java
index e3f2ccf6..0febb93f 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IIterableEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IIterableEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRangedEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRangedEndorelation.java
index 1b338d16..d281a913 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRangedEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRangedEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRecursivelyDefinedEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRecursivelyDefinedEndorelation.java
index 65ce62c4..47a12de5 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRecursivelyDefinedEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/IRecursivelyDefinedEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/RecursivelyDefinedEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/RecursivelyDefinedEndorelation.java
index 4c35ab38..77c68561 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/RecursivelyDefinedEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/RecursivelyDefinedEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/TypeAdaptedEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/TypeAdaptedEndorelation.java
index 792b86cd..80e60afd 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/TypeAdaptedEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/TypeAdaptedEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo;
import static org.eclipse.emf.diffmerge.structures.Relations.endoTransitiveClosure;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingInvertibleQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingInvertibleQEndorelation.java
index 8d7f3496..36ee59d2 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingInvertibleQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingInvertibleQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingQEndorelation.java
index a17cfe50..a1a14bd4 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/CachingQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import static org.eclipse.emf.diffmerge.structures.Relations.qualifiedGet;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableInvertibleQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableInvertibleQEndorelation.java
index 36ff6c0f..50af1c80 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableInvertibleQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableInvertibleQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableQEndorelation.java
index 5ecd4066..94f152e7 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/EditableQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/ICachingQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/ICachingQEndorelation.java
index 11865b6e..8b5fa7f0 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/ICachingQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/ICachingQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import org.eclipse.emf.diffmerge.structures.endo.ICachingEndorelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IIterableQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IIterableQEndorelation.java
index 9ce0b816..7d65b8fb 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IIterableQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IIterableQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import org.eclipse.emf.diffmerge.structures.endo.IIterableEndorelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IQEndorelation.java
index b8a1ed5c..7f0f7613 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import org.eclipse.emf.diffmerge.structures.binary.qualified.IQBinaryRelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRangedQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRangedQEndorelation.java
index d39966c0..bb3a7bfc 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRangedQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRangedQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import org.eclipse.emf.diffmerge.structures.binary.qualified.IQBinaryRelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRecursivelyDefinedQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRecursivelyDefinedQEndorelation.java
index 4e6917fc..713166e2 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRecursivelyDefinedQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/IRecursivelyDefinedQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import org.eclipse.emf.diffmerge.structures.endo.IRecursivelyDefinedEndorelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/RecursivelyDefinedQEndorelation.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/RecursivelyDefinedQEndorelation.java
index 441a7a1d..d91265b2 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/RecursivelyDefinedQEndorelation.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/endo/qualified/RecursivelyDefinedQEndorelation.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.endo.qualified;
import static org.eclipse.emf.diffmerge.structures.Relations.qualifiedGet;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/CachingImpact.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/CachingImpact.java
index e50a408e..081e8ac9 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/CachingImpact.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/CachingImpact.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import static org.eclipse.emf.diffmerge.structures.impacts.Impacts.createCompositeRule;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpact.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpact.java
index 72c2502a..e16d3b39 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpact.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpact.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import org.eclipse.emf.diffmerge.structures.endo.qualified.ICachingQEndorelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpactRule.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpactRule.java
index bf98f850..1d7c155c 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpactRule.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/IImpactRule.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import org.eclipse.emf.diffmerge.structures.endo.IEndorelation;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impact.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impact.java
index f6edea3f..3defb663 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impact.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impact.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import static org.eclipse.emf.diffmerge.structures.impacts.Impacts.createCompositeRule;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/ImpactRule.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/ImpactRule.java
index a01e9c4c..5191d155 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/ImpactRule.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/ImpactRule.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import org.eclipse.emf.diffmerge.structures.IEqualityTester;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impacts.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impacts.java
index d42be143..9f94dfda 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impacts.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/Impacts.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/InvertibleImpact.java b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/InvertibleImpact.java
index e487f7e6..ef8faa22 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/InvertibleImpact.java
+++ b/plugins/org.eclipse.emf.diffmerge.structures/src/org/eclipse/emf/diffmerge/structures/impacts/InvertibleImpact.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.structures.impacts;
import static org.eclipse.emf.diffmerge.structures.impacts.Impacts.createCompositeRule;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/about.html b/plugins/org.eclipse.emf.diffmerge.ui.gmf/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties b/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties
index 2db4d01f..f8c006cf 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties
index 2df8f92f..cfe5d7b7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = GMF Diff/Merge Sample UI Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml
index adbd8318..e341499e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- <copyright>
-
Copyright (c) 2010-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
-
- </copyright>
-->
<plugin>
<extension
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethod.java
index e2a5a048..bf435dc3 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import org.eclipse.emf.diffmerge.api.IDiffPolicy;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethodFactory.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethodFactory.java
index 39c9d742..f62b145a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethodFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFComparisonMethodFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeLabelProvider.java
index e529f0c3..8cd6395d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeLabelProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeUIPlugin.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeUIPlugin.java
index c6e69871..4fe78676 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeUIPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFDiffMergeUIPlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFScopeDefinitionFactory.java
index f1edb95c..4f75e8cd 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/GMFScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/Messages.java b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/Messages.java
index 3cf175ab..1266fd57 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/Messages.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.gmf;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/messages.properties b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/messages.properties
index 593904b3..2418cd9b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/src/org/eclipse/emf/diffmerge/ui/gmf/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
GmfComparisonFactory_Label=Configurable comparison method supporting GMF diagrams
GMFDiffMergeLabelProvider_Layout=Layout
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/about.html b/plugins/org.eclipse.emf.diffmerge.ui.sirius/about.html
index 420ad0f9..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/about.html
@@ -1,27 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html -->
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2006</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-
-</body></html> \ No newline at end of file
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties b/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties
index ae59dedd..c8cea091 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties
@@ -1,9 +1,10 @@
###############################################################################
-# Copyright (c) 2006-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2010-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties
index ab22aa64..42e7178c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
-# Copyright (c) 2006-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2010-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Sirius Diff/Merge UI Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml
index b368e0f6..7f74b96f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- <copyright>
-
- Copyright (c) 2006-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
-
- </copyright>
-->
<plugin>
<extension
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/Messages.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/Messages.java
index 9537f5d4..52f55aee 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/Messages.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethod.java
index 07d676ea..95b5f246 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethodFactory.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethodFactory.java
index 81f0622e..bf012443 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethodFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusComparisonMethodFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeLabelProvider.java
index dff8ea7b..1807cc65 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeLabelProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeUIPlugin.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeUIPlugin.java
index fa79ba90..c7ac74f5 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeUIPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDiffMergeUIPlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDifferenceCategoryProvider.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDifferenceCategoryProvider.java
index 698ac0ab..ef8486ea 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDifferenceCategoryProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusDifferenceCategoryProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import org.eclipse.emf.diffmerge.ui.viewers.DefaultDifferenceCategoryProvider;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusScopeDefinitionFactory.java
index 07aaf07d..661d693c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2006-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*********************************************************************
+ * Copyright (c) 2010-2018 Thales Global Services S.A.S.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusTechnicalDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusTechnicalDifferenceCategory.java
index 6c557ed2..ef15c934 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusTechnicalDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/SiriusTechnicalDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.sirius;
import java.util.Arrays;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/messages.properties b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/messages.properties
index 4862ed7c..b21b45f7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/src/org/eclipse/emf/diffmerge/ui/sirius/messages.properties
@@ -1,9 +1,10 @@
#===============================================================================
-# Copyright (c) 2006-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2010-2018 Thales Global Services S.A.S.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Thales - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/about.html b/plugins/org.eclipse.emf.diffmerge.ui/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/about.html
+++ b/plugins/org.eclipse.emf.diffmerge.ui/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/build.properties b/plugins/org.eclipse.emf.diffmerge.ui/build.properties
index 9b2634f8..c293c093 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
source.. = src/
output.. = bin/
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
index 91fbf8bb..7465000e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Sample UI Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml
index 2f2ff0db..a6d09da9 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- <copyright>
-
Copyright (c) 2010-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
-
- </copyright>
-->
<plugin>
<extension-point id="org.eclipse.emf.diffmerge.ui.modelComparisonContext" name="ModelComparisonContext" schema="schema/ModelComparisonContext.exsd"/>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd b/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd
index fca95e47..475e0d73 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd
+++ b/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd
@@ -136,9 +136,12 @@ In addition, this plug-in extends this extension point to register the following
<meta.section type="copyright"/>
</appinfo>
<documentation>
- Copyright (c) 2010-2018 Thales Global Services S.A.S.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+ Copyright (c) 2010-2018 Thales Global Services S.A.S.
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/EMFDiffMergeUIPlugin.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/EMFDiffMergeUIPlugin.java
index 99217a3e..5a90e51b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/EMFDiffMergeUIPlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/EMFDiffMergeUIPlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/Messages.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/Messages.java
index d8d6a65f..c772fe4a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/Messages.java
@@ -1,18 +1,15 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
* Stephane Bouchet (Intel Corporation) - Bug #442492 : hide number of differences in the UI
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/ComparisonSelection.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/ComparisonSelection.java
index 46901e63..0b321765 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/ComparisonSelection.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/ComparisonSelection.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataFactory.java
index 1a74048e..65231156 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.ecore.EFactory;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataPackage.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataPackage.java
index b5c9f8b5..8e8d2f54 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataPackage.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/DiffuidataPackage.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/MatchAndFeature.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/MatchAndFeature.java
index 39077a1e..a033b615 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/MatchAndFeature.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/MatchAndFeature.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.diffmerge.diffdata.EMatch;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java
index 290a2f21..a233ef7a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UIComparison.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.diffmerge.diffdata.EComparison;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java
index 26342644..824a8cd2 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.ecore.EFactory;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java
index dc563793..c72aa3a1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/ComparisonSelectionImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/ComparisonSelectionImpl.java
index 88741bf4..9ceba97b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/ComparisonSelectionImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/ComparisonSelectionImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataFactoryImpl.java
index 45356da4..d0db8387 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataFactoryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataFactoryImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java
index d6134543..ec060309 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/DiffuidataPackageImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchAndFeatureImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchAndFeatureImpl.java
index ba91a5a4..7932f34f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchAndFeatureImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchAndFeatureImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import org.eclipse.emf.common.notify.Notification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchToNbEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchToNbEntryImpl.java
index 5155538c..86885ed0 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchToNbEntryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/MatchToNbEntryImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import org.eclipse.emf.common.notify.Notification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java
index b309b735..fef28fef 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UIComparisonImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import org.eclipse.emf.common.notify.Notification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java
index 4088282c..6ded45fd 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java
index dcee93e8..97bcbdab 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.impl;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataAdapterFactory.java
index d4b459db..19297940 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataAdapterFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataAdapterFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceFactoryImpl.java
index 1dbed46a..4f65cda8 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceFactoryImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceImpl.java
index 03493d97..35240d99 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataResourceImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataSwitch.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataSwitch.java
index d5543b04..9b4e4653 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataSwitch.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/DiffuidataSwitch.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java
index 40ab61ea..bfb9d634 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java
index 735eee35..d2f74918 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java
index 6d956b57..03c073ed 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java
index 30f2d73b..5dc9f46c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.diffuidata.util;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/AbstractLogEvent.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/AbstractLogEvent.java
index 923e185d..a8004460 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/AbstractLogEvent.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/AbstractLogEvent.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.log;
import org.eclipse.emf.diffmerge.api.IMatch;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/CompareLogEvent.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/CompareLogEvent.java
index 2b1b9e27..28eba269 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/CompareLogEvent.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/CompareLogEvent.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.log;
import static org.eclipse.emf.diffmerge.ui.log.DiffMergeLogger.LINE_SEP;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/DiffMergeLogger.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/DiffMergeLogger.java
index 8fc135bb..93bb9e80 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/DiffMergeLogger.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/DiffMergeLogger.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.log;
import java.io.FileOutputStream;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/MergeLogEvent.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/MergeLogEvent.java
index 4eb46cd4..6eaa4917 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/MergeLogEvent.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/log/MergeLogEvent.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.log;
import static org.eclipse.emf.diffmerge.ui.log.DiffMergeLogger.LINE_SEP;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/messages.properties b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/messages.properties
index 134a7084..fb79cca5 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/messages.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/messages.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
AbstractComparisonViewer_CatSetDescription3Way=Differences whose characteristics are specific to three-way comparisons.
AbstractComparisonViewer_CatSetDescriptionBasic=Differences that conform to basic, technical criteria.
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/AbstractComparisonSetup.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/AbstractComparisonSetup.java
index b74ae020..cd2fc796 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/AbstractComparisonSetup.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/AbstractComparisonSetup.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareEditorAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareEditorAdapterFactory.java
index 2841c859..21810b68 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareEditorAdapterFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareEditorAdapterFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import org.eclipse.core.runtime.IAdapterFactory;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareModelsAction.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareModelsAction.java
index 8fc72351..b453dc5e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareModelsAction.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/CompareModelsAction.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import java.util.Collections;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetup.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetup.java
index 37a46ffd..1bc85df2 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetup.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetup.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
index 61e31a65..64c402f3 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizard.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizard.java
index e0ce270f..d54aba9c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizard.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizard.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizardPage.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizardPage.java
index 72a2bbfb..33067bd7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupWizardPage.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import static org.eclipse.emf.diffmerge.ui.setup.ComparisonSetup.PROPERTY_COMPARISON_METHOD;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java
index ec92eb59..4b8b9aeb 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/EMFDiffMergeEditorInput.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import java.lang.reflect.InvocationTargetException;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ModelScopeTypedElement.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ModelScopeTypedElement.java
index 8b81361c..a0a8c398 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ModelScopeTypedElement.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ModelScopeTypedElement.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2015-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.setup;
import org.eclipse.compare.ITypedElement;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinition.java
index 90884509..a4759af6 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinition.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinitionFactory.java
index 64d7388b..7e1253e4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/AbstractScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java
index 7aafd23e..6db6a86a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethodFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethodFactory.java
index cb9475e4..f6ea9264 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethodFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IComparisonMethodFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
import org.eclipse.emf.diffmerge.api.config.IComparisonConfiguration;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinition.java
index 746e5ab3..61a82abd 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinition.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
import org.eclipse.emf.diffmerge.api.scopes.IEditableModelScope;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
index b2073306..c6b96041 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IOverridableFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IOverridableFactory.java
index 0805fe60..3047d09f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IOverridableFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IOverridableFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ITimestampProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ITimestampProvider.java
index 6e0880a1..ac0f2b6a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ITimestampProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ITimestampProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/AbstractComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/AbstractComparisonMethod.java
index 4daddc3c..e5a16432 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/AbstractComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/AbstractComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ComparisonConfiguration.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ComparisonConfiguration.java
index f2384aec..b6fa0e17 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ComparisonConfiguration.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ComparisonConfiguration.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java
index f8826479..8fc0a979 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethodFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethodFactory.java
index d75e4599..3e834a52 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethodFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigurableComparisonMethodFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigureComparisonDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigureComparisonDialog.java
index df5b4280..5f78e372 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigureComparisonDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ConfigureComparisonDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethod.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethod.java
index 2d89abac..badef084 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethod.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethod.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethodFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethodFactory.java
index 477de1df..982f8a5e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethodFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/DefaultComparisonMethodFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinition.java
index 9e696dc5..62885aba 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinition.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinitionFactory.java
index 46c3c6a5..4b685b3d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/EObjectScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinition.java
index 3b462f42..9db04f40 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinition.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import org.eclipse.emf.diffmerge.api.scopes.IEditableModelScope;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinitionFactory.java
index c79989e1..204f4cef 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/ResourceScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinition.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinition.java
index 4ce3375f..1512441d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinition.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinition.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import org.eclipse.emf.common.util.URI;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinitionFactory.java
index 02edfadc..4d3c0488 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/ext/URIScopeDefinitionFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.specification.ext;
import java.io.File;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/CompositeUndoContext.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/CompositeUndoContext.java
index e17adaad..393b6837 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/CompositeUndoContext.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/CompositeUndoContext.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DefaultDiffLabelDecorator.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DefaultDiffLabelDecorator.java
index c0abb018..6b7d0ff1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DefaultDiffLabelDecorator.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DefaultDiffLabelDecorator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DelegatingLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DelegatingLabelProvider.java
index b8ce0bb1..1b801ac1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DelegatingLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DelegatingLabelProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffDecoratingLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffDecoratingLabelProvider.java
index 231178a7..b2bf9b77 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffDecoratingLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffDecoratingLabelProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.regex.Matcher;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffLabelDecorator.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffLabelDecorator.java
index 63e56caa..0a97adb7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffLabelDecorator.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffLabelDecorator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import static org.eclipse.emf.diffmerge.ui.viewers.DefaultUserProperties.*;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeDialog.java
index 5d7d32b4..2fdb48db 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import org.eclipse.emf.diffmerge.api.IComparison;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeLabelProvider.java
index b9073f98..5c7aaecc 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeLabelProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DiffMergeLabelProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import org.eclipse.core.resources.IFile;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DifferenceKind.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DifferenceKind.java
index 76260383..3ebdfb56 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DifferenceKind.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/DifferenceKind.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/GitLikeDiffLabelDecorator.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/GitLikeDiffLabelDecorator.java
index 7c1d8289..0639fb90 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/GitLikeDiffLabelDecorator.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/GitLikeDiffLabelDecorator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IDiffLabelDecorator.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IDiffLabelDecorator.java
index 57d85a0f..5b2e3854 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IDiffLabelDecorator.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IDiffLabelDecorator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IUserPropertyOwner.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IUserPropertyOwner.java
index 184bd06f..b54d630e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IUserPropertyOwner.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/IUserPropertyOwner.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/InconsistencyDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/InconsistencyDialog.java
index d74605cb..fa474805 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/InconsistencyDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/InconsistencyDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/MiscUtil.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/MiscUtil.java
index df4491f9..71afd82b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/MiscUtil.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/MiscUtil.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.lang.reflect.InvocationTargetException;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/SymmetricMatchComparer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/SymmetricMatchComparer.java
index c3376856..fbbe67e4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/SymmetricMatchComparer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/SymmetricMatchComparer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import static org.eclipse.emf.diffmerge.api.Role.ANCESTOR;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UIUtil.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UIUtil.java
index 0e6964ae..19bafffe 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UIUtil.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UIUtil.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserProperty.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserProperty.java
index c7707c70..8574d46b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserProperty.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserProperty.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.HashSet;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserPropertyOwner.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserPropertyOwner.java
index c817f3dd..8515e5b4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserPropertyOwner.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/util/UserPropertyOwner.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.util;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/AbstractComparisonViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/AbstractComparisonViewer.java
index 6502f7ab..03e2779a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/AbstractComparisonViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/AbstractComparisonViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2013-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.HashSet;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryDialog.java
index 945c0ebe..914a784d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
index 42da0393..5254ef7f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.viewers.DefaultUserProperties.P_SHOW_DIFFERENCE_NUMBERS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryViewer.java
index 6bea5a63..ef9f3485 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.viewers.CategoryViewer.CategoryState.FILTERED;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java
index 95095e6f..a7d1dcca 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonSideViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonSideViewer.java
index d925edeb..f330c8eb 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonSideViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonSideViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonTreeViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonTreeViewer.java
index a8ed8c78..6e8b19fb 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonTreeViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonTreeViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonViewer.java
index 520a5754..3c942d1d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonViewer.java
@@ -1,11 +1,10 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
@@ -13,9 +12,7 @@
* Stephane Bouchet (Intel Corporation) - Bug #489274 : added API viewers creation methods
* Jeremy Aubry (Obeo) - Bug #500417 : Cannot call a merge with a given selection programmatically
* Stephane Bouchet (Intel Corporation) - Bug # : added external editor for text differences
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.util.UIUtil.itemAddDisposeListener;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultDifferenceCategoryProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultDifferenceCategoryProvider.java
index dd782ebc..c0a64fd4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultDifferenceCategoryProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultDifferenceCategoryProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultUserProperties.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultUserProperties.java
index a50891b9..648fe31e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultUserProperties.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DefaultUserProperties.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.util.UserProperty.Identifier;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DirectedComparisonViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DirectedComparisonViewer.java
index 8aba0f03..45374deb 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DirectedComparisonViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/DirectedComparisonViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java
index 4c4e46e0..dc04eb72 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EMFDiffNode.java
@@ -1,18 +1,15 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
* Stephane Bouchet (Intel Corporation) - Bug #442492 : hide number of differences in the UI
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.viewers.DefaultUserProperties.P_SUPPORT_UNDO_REDO;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonSideViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonSideViewer.java
index f27de049..ccd375a4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonSideViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonSideViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.api.scopes.IModelScope;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonTreeViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonTreeViewer.java
index d10e1382..e4f23897 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonTreeViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedComparisonTreeViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedFeaturesViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedFeaturesViewer.java
index cf271719..f99fa36d 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedFeaturesViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedFeaturesViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.viewers.DefaultUserProperties.P_TECHNICAL_LABELS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedValuesViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedValuesViewer.java
index 04bbaa09..eb1a87d4 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedValuesViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/EnhancedValuesViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.viewers.ValuesViewer.ValuesInput;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java
index 02be9315..61d044ba 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java
@@ -1,18 +1,15 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
* Stephane Bouchet (Intel Corporation) - Bug #489142 : use the delegate label provider to display text
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.ui.viewers.DefaultUserProperties.P_TECHNICAL_LABELS;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/HeaderViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/HeaderViewer.java
index e15de96d..b09e0c37 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/HeaderViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/HeaderViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.util.UIUtil;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IComparisonSideViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IComparisonSideViewer.java
index 62c36025..d452fe2f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IComparisonSideViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IComparisonSideViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategory.java
index 9b212c39..60d8ae40 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryItem.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryItem.java
index 10e4bda4..213f10c7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryItem.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryItem.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryProvider.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryProvider.java
index 0df1b8a7..4da3dd7b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryProvider.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategoryProvider.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategorySet.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategorySet.java
index 5d06c9cd..7fe2b0ed 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategorySet.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceCategorySet.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceRelatedViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceRelatedViewer.java
index 8332aefa..0972f3b1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceRelatedViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IDifferenceRelatedViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoiceData.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoiceData.java
index 2084fad5..78f78c4e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoiceData.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoiceData.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoicesDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoicesDialog.java
index 0a1cefc2..04068a51 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoicesDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/IgnoreChoicesDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoiceData.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoiceData.java
index 8379b120..58b23569 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoiceData.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoiceData.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoicesDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoicesDialog.java
index 50159c22..71a4d291 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoicesDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeChoicesDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactMessageDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactMessageDialog.java
index 99639729..a0e9897f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactMessageDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactMessageDialog.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2014-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.ui.Messages;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactViewer.java
index fcf4cca3..1cb3e187 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/MergeImpactViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ModelScopeViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ModelScopeViewer.java
index 1337aea4..ffd7506a 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ModelScopeViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ModelScopeViewer.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import org.eclipse.emf.diffmerge.api.scopes.IModelScope;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/SelectionBridge.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/SelectionBridge.java
index 110e92a9..aa984e6b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/SelectionBridge.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/SelectionBridge.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextCompareContent.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextCompareContent.java
index 50b72009..8f90f55b 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextCompareContent.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextCompareContent.java
@@ -1,18 +1,15 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - Bug #516234 : initial API and implementation
* Olivier Constant (Thales Global Services) - final integration
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.io.ByteArrayInputStream;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextMergerDialog.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextMergerDialog.java
index dcb66f1f..071e492f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextMergerDialog.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/TextMergerDialog.java
@@ -1,18 +1,15 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Intel Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stephane Bouchet (Intel Corporation) - Bug #516234 : initial API and implementation
* Olivier Constant (Thales Global Services) - final integration
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import static org.eclipse.emf.diffmerge.api.Role.ANCESTOR;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java
index 25dda819..95abe782 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java
@@ -1,19 +1,16 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
* Stephane Bouchet (Intel Corporation) - [439901] support multi-line in table item.
* Stephane Bouchet (Intel Corporation) - Bug #489137 : delegate tooltip of values viewer to proper label provider
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategory.java
index f2946a6a..9fa6ccff 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategoryItem.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategoryItem.java
index 429328d0..663be463 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategoryItem.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractDifferenceCategoryItem.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractSideRelatedDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractSideRelatedDifferenceCategory.java
index 22a12c3e..6ffe7c44 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractSideRelatedDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/AbstractSideRelatedDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ConflictCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ConflictCategory.java
index 84358e61..1145712c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ConflictCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ConflictCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/DifferenceCategorySet.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/DifferenceCategorySet.java
index 542d38c9..e7401ef6 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/DifferenceCategorySet.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/DifferenceCategorySet.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.common.util.BasicEList;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/IgnoredDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/IgnoredDifferenceCategory.java
index fbcbeb67..1f96e448 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/IgnoredDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/IgnoredDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MergedDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MergedDifferenceCategory.java
index 11eaedd4..e59480b7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MergedDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MergedDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MoveCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MoveCategory.java
index 0a9def2c..b6ac2b6c 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MoveCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/MoveCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/OrderDifferenceCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/OrderDifferenceCategory.java
index 7b67086f..dd4c6694 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/OrderDifferenceCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/OrderDifferenceCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/PropertyChangeCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/PropertyChangeCategory.java
index 2a20b811..dd2f0afc 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/PropertyChangeCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/PropertyChangeCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ThreeWayOriginCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ThreeWayOriginCategory.java
index 55e3b445..f43806f2 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ThreeWayOriginCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/ThreeWayOriginCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
index 2fc76f06..54b38fd0 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2016-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge/about.html b/plugins/org.eclipse.emf.diffmerge/about.html
index 7e766fe1..720a1d06 100644
--- a/plugins/org.eclipse.emf.diffmerge/about.html
+++ b/plugins/org.eclipse.emf.diffmerge/about.html
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.diffmerge/build.properties b/plugins/org.eclipse.emf.diffmerge/build.properties
index 83fb96f1..9f9debc7 100644
--- a/plugins/org.eclipse.emf.diffmerge/build.properties
+++ b/plugins/org.eclipse.emf.diffmerge/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
bin.includes = .,\
model/,\
diff --git a/plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore b/plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore
index 470f190f..79b02bad 100644
--- a/plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore
+++ b/plugins/org.eclipse.emf.diffmerge/model/DiffData.ecore
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge/model/DiffData.genmodel b/plugins/org.eclipse.emf.diffmerge/model/DiffData.genmodel
index 2ffa0407..cabfd8ea 100644
--- a/plugins/org.eclipse.emf.diffmerge/model/DiffData.genmodel
+++ b/plugins/org.eclipse.emf.diffmerge/model/DiffData.genmodel
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
diff --git a/plugins/org.eclipse.emf.diffmerge/plugin.properties b/plugins/org.eclipse.emf.diffmerge/plugin.properties
index e150be65..8b883736 100644
--- a/plugins/org.eclipse.emf.diffmerge/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2010-2018 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = EMF Diff/Merge Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.diffmerge/plugin.xml b/plugins/org.eclipse.emf.diffmerge/plugin.xml
index 2d62059b..97949d2b 100644
--- a/plugins/org.eclipse.emf.diffmerge/plugin.xml
+++ b/plugins/org.eclipse.emf.diffmerge/plugin.xml
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- <copyright>
-
Copyright (c) 2010-2018 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Thales Global Services S.A.S - initial API and implementation
-
- </copyright>
-->
<plugin>
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/EMFDiffMergePlugin.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/EMFDiffMergePlugin.java
index 996a558b..7c6188b8 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/EMFDiffMergePlugin.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/EMFDiffMergePlugin.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge;
import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/Messages.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/Messages.java
index b3842052..7077724d 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/Messages.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/Messages.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge;
import org.eclipse.osgi.util.NLS;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java
index a97dc89f..5f1ffbd0 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java
index 7d8ab274..17a992fd 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java
index bc09fb6e..77e42cff 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java
index dbb0cd71..417bae2a 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java
index dc89f540..81249f69 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.Comparator;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java
index 8dd914f3..135a7dba 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java
index 44e2fc66..5f845f90 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java
index 9d22e7f2..105a9df4 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java
index cba5b9c8..ceb0277c 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java
index eb0e057e..dec88a87 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.config;
import org.eclipse.emf.diffmerge.api.IDiffPolicy;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java
index c373dba3..f85755bb 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.config;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java
index 4796e1ec..d6a3cfc0 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.config;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java
index 10c38d9c..9973a1c4 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2017-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.config;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java
index 4e5efc43..87859919 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java
index e1845f9c..eadc53dd 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.diffmerge.api.IComparison;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java
index 4ac49aad..da326aa1 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.diffmerge.api.IMatch;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java
index 6f961bba..3f7f52a3 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.diffmerge.api.IMatch;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java
index 87f9d88c..bc2e0bbe 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java
index 736a3ec6..88ecb0e8 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java
index 57ce37f2..da769d0e 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java
index b42b8f24..d371f221 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.diffmerge.api.IDiffPolicy;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java
index f17bbd06..990e3200 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.diff;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IEditableModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IEditableModelScope.java
index 3605bf1b..facf02aa 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IEditableModelScope.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IEditableModelScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.scopes;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFeaturedModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFeaturedModelScope.java
index 8387fe88..973c0e60 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFeaturedModelScope.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFeaturedModelScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.scopes;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFragmentedModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFragmentedModelScope.java
index eb7a5e42..42c82ec8 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFragmentedModelScope.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IFragmentedModelScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.scopes;
import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IModelScope.java
index 14847a7d..9252e850 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IModelScope.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IModelScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.scopes;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java
index b607e0c7..fd152b94 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.api.scopes;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataFactory.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataFactory.java
index 92d9c20a..8876669c 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataFactory.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.ecore.EFactory;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java
index 84f29ed7..ba8d8afb 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/DiffdataPackage.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.ecore.EAttribute;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java
index f2191d4c..e055b8d5 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EAttributeValuePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.diffmerge.api.diff.IAttributeValuePresence;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java
index c4d130f0..bf5370ca 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EComparison.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.diffmerge.api.IComparison.Editable;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java
index a72c24a9..315fb404 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementPresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.diffmerge.api.diff.IElementPresence;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java
index 0bdfd9c1..952df0c9 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.diffmerge.api.Role;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java
index e4b9b59c..5997a1c2 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMapping.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java
index 1d307ea1..502cdfc2 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMatch.java
@@ -1,17 +1,14 @@
-/**
- * <copyright>
- *
+/*********************************************************************
* Copyright (c) 2010-2018 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales Global Services S.A.S. - initial API and implementation
- *
- * </copyright>
- */
+ **********************************************************************/
package org.eclipse.emf.diffmerge.diffdata;
import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java
index cf57293d..d7d4dddc 100644
--- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java
+++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java
@@ -1,17 +1,14 @@
-/**
- * <copyrigh