diff options
| author | Olivier Constant | 2019-09-24 13:20:51 +0000 |
|---|---|---|
| committer | Olivier Constant | 2019-09-24 13:20:51 +0000 |
| commit | 172f4aade62d4f6d0cf3b9c1ce0b3cbc50ecc43e (patch) | |
| tree | c30f53e96cb23d87a6b281d9f10c57a3a64c740e /plugins | |
| parent | ad5cd3a0c91f009e1da0055ed79f803e34ac7b02 (diff) | |
| download | org.eclipse.emf.diffmerge.core-172f4aade62d4f6d0cf3b9c1ce0b3cbc50ecc43e.tar.gz org.eclipse.emf.diffmerge.core-172f4aade62d4f6d0cf3b9c1ce0b3cbc50ecc43e.tar.xz org.eclipse.emf.diffmerge.core-172f4aade62d4f6d0cf3b9c1ce0b3cbc50ecc43e.zip | |
[releng] Update of copyrights
Change-Id: I5046d9d9427185c7a0203a8dc32861b873f88c43
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'plugins')
368 files changed, 368 insertions, 368 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties index 37790b87..7dd4414d 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.core/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties index ef16a7de..f20a5fd9 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml index 7bea899f..0867f178 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.connector.core/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2015-2018 Intel Corporation and others. + Copyright (c) 2015-2019 Intel Corporation and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at https://www.eclipse.org/legal/epl-2.0/ 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 57d8f367..22ad0cf5 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 882c18e4..c981aeac 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 3ded583c..8c0dfb1d 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 8335508c..6b82e91d 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 293e553e..23936bec 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 e8da6c8f..aa13c79f 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 172b900b..f2127789 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 a5df225d..03aa053b 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 3cbce355..8e1de478 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,5 +1,5 @@ /** - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 3a2a504e..970e5e11 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,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties index 37790b87..7dd4414d 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties index ef5e1077..7a29d9a5 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml index 7d5b98a7..8debbb5d 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2015-2018 Intel Corporation and others. + Copyright (c) 2015-2019 Intel Corporation and others. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which is available at https://www.eclipse.org/legal/epl-2.0/ 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 f8af2201..b3c9bf48 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 07c71e19..16a3cdb2 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 08f6d257..363a8aa5 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 472e24cf..ce507f77 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 b0ce5f40..10b8a31a 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 1f84a036..c5f926c8 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,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015-2018 Intel Corporation and others. + * Copyright (c) 2015-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 4570dac6..c27fd80d 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,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015-2018 Intel Corporation and others. +# Copyright (c) 2015-2019 Intel Corporation and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/Messages.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/Messages.java index 26b2d192..e730d65e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/Messages.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/Messages.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IComparison.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IComparison.java index d9eb9682..f423fe2a 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IComparison.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IComparison.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IDiffPolicy.java index 3e9d6d57..032ab4f9 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IDiffPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IDiffPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMapping.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMapping.java index 807d59f6..1e60544e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMapping.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMapping.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatch.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatch.java index 93e97def..a87f5ea6 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatch.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatch.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatchPolicy.java index 5bc15716..c13c75de 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatchPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMatchPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergePolicy.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergePolicy.java index 5e31eda2..edcca63a 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergePolicy.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergePolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergeSelector.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergeSelector.java index 922f120f..5f218286 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergeSelector.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IMergeSelector.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IPureMatch.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IPureMatch.java index f2d7e397..b46f594c 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IPureMatch.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/IPureMatch.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/Role.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/Role.java index b2dcee14..e502f78e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/Role.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/Role.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfiguration.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfiguration.java index 87ea33a8..24680553 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfiguration.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfiguration.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfigurator.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfigurator.java index 88786d75..576ab8fa 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfigurator.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IComparisonConfigurator.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurablePolicy.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurablePolicy.java index 14863364..0001765a 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurablePolicy.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurablePolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurationElement.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurationElement.java index a64e4883..5fb74cf6 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurationElement.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/config/IConfigurationElement.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IAttributeValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IAttributeValuePresence.java index 79e1818b..07249465 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IAttributeValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IAttributeValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IDifference.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IDifference.java index 743572ba..7a92b86c 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IDifference.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IDifference.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementPresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementPresence.java index 6cad3cf3..6c46a67d 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementPresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementPresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativeDifference.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativeDifference.java index d5ef42bc..f07f69eb 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativeDifference.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativeDifference.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativePresence.java index a76825dd..61042831 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IElementRelativePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IMergeableDifference.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IMergeableDifference.java index 845e7ee5..7d4d528e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IMergeableDifference.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IMergeableDifference.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IPresenceDifference.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IPresenceDifference.java index 177e9e9c..a712fed9 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IPresenceDifference.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IPresenceDifference.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IReferenceValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IReferenceValuePresence.java index c7943c64..aa02ca9b 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IReferenceValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IReferenceValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IValuePresence.java index 58378138..9ba9a54b 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/api/diff/IValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EAttributeValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EAttributeValuePresence.java index 87a6a0e4..3c5a6c54 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EAttributeValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EAttributeValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparison.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparison.java index 52328bff..f1482681 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparison.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EComparison.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementPresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementPresence.java index 357bf36b..95057836 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementPresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementPresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementRelativePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementRelativePresence.java index 2d3c2ddf..5c9e405f 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementRelativePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EElementRelativePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMapping.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMapping.java index cb0c7317..0401fb29 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMapping.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMapping.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMatch.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMatch.java index 97c4381a..4d02ad0d 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMatch.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMatch.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMergeableDifference.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMergeableDifference.java index a30e279f..1ce7a527 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMergeableDifference.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EMergeableDifference.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EReferenceValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EReferenceValuePresence.java index e248cf17..d421c929 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EReferenceValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EReferenceValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EValuePresence.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EValuePresence.java index c3847cd6..f82e25a7 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/EValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataFactory.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataFactory.java index ec897584..6d652f8c 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataFactory.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataPackage.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataPackage.java index df8eb293..34fb6d15 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataPackage.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/GdiffdataPackage.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EAttributeValuePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EAttributeValuePresenceImpl.java index 975d8b19..df6e7de4 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EAttributeValuePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EAttributeValuePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EComparisonImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EComparisonImpl.java index 503fd9b5..53a1e513 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EComparisonImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EComparisonImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementPresenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementPresenceImpl.java index 36663e07..872f538d 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementPresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementPresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementRelativePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementRelativePresenceImpl.java index f379c3d1..1f8fff2b 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementRelativePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EElementRelativePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMappingImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMappingImpl.java index 0e8244d9..715d0657 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMappingImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMappingImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMatchImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMatchImpl.java index 6a2ef7cf..3a18e56b 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMatchImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMatchImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMergeableDifferenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMergeableDifferenceImpl.java index 5f18c8eb..c5b15a99 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMergeableDifferenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EMergeableDifferenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EReferenceValuePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EReferenceValuePresenceImpl.java index 64636c49..f3a9cc48 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EReferenceValuePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EReferenceValuePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EValuePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EValuePresenceImpl.java index 8f6a74b9..6086bf6e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EValuePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/EValuePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataFactoryImpl.java index a1653bcb..f8563e3a 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataFactoryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataFactoryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataPackageImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataPackageImpl.java index 8129638c..56184acd 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataPackageImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/impl/GdiffdataPackageImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataAdapterFactory.java index 126ddb1a..69e2d4ee 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataAdapterFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataAdapterFactory.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceFactoryImpl.java index 171ce9aa..16fb27db 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceFactoryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceFactoryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceImpl.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceImpl.java index 92c6bf97..6dfa11de 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataResourceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataSwitch.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataSwitch.java index d46da893..71df2953 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataSwitch.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/gdiffdata/util/GdiffdataSwitch.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/AbstractExpensiveOperation.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/AbstractExpensiveOperation.java index 21942dcc..cb2201d1 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/AbstractExpensiveOperation.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/AbstractExpensiveOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/BidirectionalComparisonCopier.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/BidirectionalComparisonCopier.java index e14f55ec..4e2efd26 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/BidirectionalComparisonCopier.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/BidirectionalComparisonCopier.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/DiffOperation.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/DiffOperation.java index 0ab06ccb..9d4210e6 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/DiffOperation.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/DiffOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S and others. + * Copyright (c) 2010-2019 Thales Global Services S.A.S and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MatchOperation.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MatchOperation.java index 7e0a269c..847c1146 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MatchOperation.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MatchOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MergeOperation.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MergeOperation.java index fb154d4a..db2eb322 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MergeOperation.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/MergeOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/UnidirectionalComparisonCopier.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/UnidirectionalComparisonCopier.java index b829637a..f84608c3 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/UnidirectionalComparisonCopier.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/helpers/UnidirectionalComparisonCopier.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/AbstractConfigurationElement.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/AbstractConfigurationElement.java index 99254c83..c5d1eeb2 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/AbstractConfigurationElement.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/AbstractConfigurationElement.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/ConfigurableMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/ConfigurableMatchPolicy.java index 80a26ae9..815c7f9e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/ConfigurableMatchPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/impl/policies/ConfigurableMatchPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/messages.properties b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/messages.properties index 5154a65b..ebf9a37c 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/messages.properties +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/messages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/util/IExpensiveOperation.java b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/util/IExpensiveOperation.java index f998b670..a5fec18e 100644 --- a/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/util/IExpensiveOperation.java +++ b/plugins/org.eclipse.emf.diffmerge.generic/src/org/eclipse/emf/diffmerge/generic/util/IExpensiveOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/build.properties b/plugins/org.eclipse.emf.diffmerge.gmf/build.properties index 00bea1ae..7cfa2f04 100644 --- a/plugins/org.eclipse.emf.diffmerge.gmf/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.gmf/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties index 3e1e1d43..30c50658 100644 --- a/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.gmf/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ 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 bd23fe12..d58bfe64 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 dbe7ed4e..5ff0c35d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a797b2ec..0b88325b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 08efee5c..2e4d1637 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 9f9b50c6..8f749dfc 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 ad447f2d..87925bc6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8ec108e9..d2af27c6 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,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/build.properties b/plugins/org.eclipse.emf.diffmerge.pojo/build.properties index 9f9debc7..0dba0e31 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.pojo/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/plugin.properties b/plugins/org.eclipse.emf.diffmerge.pojo/plugin.properties index 236d9e5e..fc4713eb 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.pojo/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/plugin.xml b/plugins/org.eclipse.emf.diffmerge.pojo/plugin.xml index b73d56bd..24aafaf2 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.pojo/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <!-- - Copyright (c) 2010-2018 Thales Global Services S.A.S. + Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/EMFDiffMergePOJOPlugin.java b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/EMFDiffMergePOJOPlugin.java index aba03d8e..9e4e8fb2 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/EMFDiffMergePOJOPlugin.java +++ b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/EMFDiffMergePOJOPlugin.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/Messages.java b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/Messages.java index 5a7e0251..f9438b23 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/Messages.java +++ b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/Messages.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/messages.properties b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/messages.properties index fe933bcd..28910fe8 100644 --- a/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/messages.properties +++ b/plugins/org.eclipse.emf.diffmerge.pojo/src/org/eclipse/emf/diffmerge/pojo/messages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/build.properties b/plugins/org.eclipse.emf.diffmerge.sirius/build.properties index d042aeea..78e4331b 100644 --- a/plugins/org.eclipse.emf.diffmerge.sirius/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.sirius/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2006-2018 Thales Global Services S.A.S. +# Copyright (c) 2006-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties b/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties index 3b32579b..3c811c0f 100644 --- a/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.sirius/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2006-2018 Thales Global Services S.A.S. +# Copyright (c) 2006-2019 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/ 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 0bab70ec..5c538284 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2006-2018 Thales Global Services S.A.S. + * Copyright (c) 2006-2019 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/ 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 25d5b958..15e9c0a6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2006-2018 Thales Global Services S.A.S. + * Copyright (c) 2006-2019 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/ 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 c18b9a9e..0fcdba1c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2006-2018 Thales Global Services S.A.S. + * Copyright (c) 2006-2019 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/ 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 fc00ea8b..b7b792a6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2006-2018 Thales Global Services S.A.S. + * Copyright (c) 2006-2019 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/ 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 e27ae66b..015f4e7d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2006-2018 Thales Global Services S.A.S. + * Copyright (c) 2006-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.structures/build.properties b/plugins/org.eclipse.emf.diffmerge.structures/build.properties index b6ee6877..a4200dc7 100644 --- a/plugins/org.eclipse.emf.diffmerge.structures/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.structures/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2017-2018 Thales Global Services S.A.S. +# Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties b/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties index 6db05eb6..6eae342c 100644 --- a/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.structures/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2017-2018 Thales Global Services S.A.S. +# Copyright (c) 2017-2019 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/ 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 e2470e98..b6ccfd64 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 68c5daed..52e7da91 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 0e03ad61..60c16200 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 ac5ee171..66e2edce 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 1715d1bf..c895d70f 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 975f7b2a..1abab3fa 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 f0e53b7e..d4964297 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 711f59f9..d9ff1787 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4d6844a2..9b846e50 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 9618d57c..3abc28f0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a9b3ad32..4f1a1a28 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 ec510d53..d47fd1b3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 963e92e9..c38f9945 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 9ff018ea..f8597dfe 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 2059c80f..b574b72b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 9993e79a..87d65356 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 60f03b7f..40504a3d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 5c3a4ede..f2da6e5b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 7ebd2568..cbf76ac3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 3e17db51..ea23c196 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 df4ebd04..14a76c25 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 7afbf469..b57f4323 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 31a63848..c61a7791 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 11c94db6..fd935371 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 e30ce5e3..e73a4cf7 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 aa779119..7abb3bf1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 e3ecf92b..1cbc16ae 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 1a999ab8..8e5d1c2a 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 7e8d00df..8fdf7d16 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 aabd0d54..cecfb482 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 88f012a7..a74b6cda 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 4ac4ae5e..d6a99bbf 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 34b873fa..cd21df7c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 1432ebe1..951590c0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 c18a7196..1d3b2ef0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 d1a7c8ec..c0bb25a6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 d9f424fa..5bc3b694 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 a3d43297..f7de98d1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 b5bdaf8b..7b661555 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 26979934..36f9bf59 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 7e310a21..913f6478 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 17f62832..2fb83ce5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 914e5d63..d08b5f73 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 f6409f16..76cad738 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 f365de50..ed08cb5d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 42d5258d..090d77ac 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 0febb93f..d84923e1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 d281a913..084e83a1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 47a12de5..d060456d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 77c68561..ef57beb1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 80e60afd..9c9cfe2d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 36ee59d2..d9b58d52 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 a1a14bd4..16354b38 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 50af1c80..3ee00802 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 94f152e7..8e86241d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8b5fa7f0..7071836b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 7d65b8fb..1a6e7acf 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 7f0f7613..52152b31 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 bb3a7bfc..ed2c037a 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 713166e2..bfb4e422 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 d91265b2..b51595c8 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 081e8ac9..f4a1176c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 e16d3b39..3819361a 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 1d7c155c..36e0b223 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 3defb663..6661bb01 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 5191d155..1b7cb3c2 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 9f94dfda..bce03f5e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 ef8faa22..c69e602d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties b/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties index f8c006cf..14a775ed 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties index cfe5d7b7..9f6e48f6 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml index e341499e..1f08f9ab 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2010-2018 Thales Global Services S.A.S. + Copyright (c) 2010-2019 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/ 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 eb164010..be6a6f45 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 f55b610f..379862bd 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8cd6395d..5064c7b4 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4fe78676..eb8f2590 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4f75e8cd..74769f65 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 1266fd57..52ae6de4 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 2418cd9b..6b86bf5d 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,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties b/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties index c8cea091..ee0c378a 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties index 42e7178c..4cb0bb57 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml index 7f74b96f..084526b4 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2010-2018 Thales Global Services S.A.S. + Copyright (c) 2010-2019 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/ 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 52f55aee..d9705392 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 3ffe74b1..cd7f9957 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 aca19f4a..b3111560 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 1807cc65..73e53b95 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 c7ac74f5..17b9c19b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 ef8486ea..68afcf1a 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 661d693c..41a23c30 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 09891868..bdd87431 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 b21b45f7..62255858 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,5 +1,5 @@ #=============================================================================== -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui/build.properties b/plugins/org.eclipse.emf.diffmerge.ui/build.properties index c293c093..47bac31b 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties index b05d2ce8..7a2f7eaa 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml b/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml index a6d09da9..bcb25113 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.ui/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2010-2018 Thales Global Services S.A.S. + Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd b/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd index 475e0d73..0b1472c2 100644 --- a/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd +++ b/plugins/org.eclipse.emf.diffmerge.ui/schema/ModelComparisonContext.exsd @@ -136,7 +136,7 @@ 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. + Copyright (c) 2010-2019 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/ 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 3a4d3e66..328ba227 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a31b8621..810ee9d1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S and others. + * Copyright (c) 2010-2019 Thales Global Services S.A.S and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 f81223a4..69b4c998 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 65231156..342cba4b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 189df462..ee91e92d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 f64971b5..17855b58 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 5e75747c..354d373b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a2f872e9..e87229db 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 d5024cba..873d350d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 564dc608..5adbaa40 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 53602d5d..51f8c748 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 36c40d85..7f335818 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 11ad17cd..f8b79be0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 c9ab9814..1e4fbf36 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4f65cda8..a38e69a5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 405f5702..c238d1c0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 bb7acfe4..bb7697c1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 deacedda..ce3a1ece 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 0e5b4c10..639c05d3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 93bb9e80..5023d438 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 010d4ce2..466ddf87 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 e2b557af..926f1f32 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,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S and others. +# Copyright (c) 2010-2019 Thales Global Services S.A.S and others. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ 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 488c1809..c3d2402f 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 21810b68..da8237d6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 b453dc5e..c74e58ac 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 837e6de9..45059db6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 32ad840c..8c8a3760 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 d54aba9c..95fb8069 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 daae7da2..c3ea3ce1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 560aea39..f72e0486 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 17fb57ff..fe29feb5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2015-2018 Thales Global Services S.A.S. + * Copyright (c) 2015-2019 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/ 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 a4759af6..8ffc261e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 7e1253e4..d943186d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 20974089..9ace6e96 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 6707fbb6..a177fa31 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 90d79a52..649ae6b8 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4d6daabe..4e18e6e2 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 3047d09f..23add5a8 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 ac0f2b6a..5c0634de 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 04a27558..cdb7f40d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 2df41962..9eff30f9 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 bdab915e..75a5643e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 1205acb1..c4f84a7e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 ef539a6c..2627134e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 b618d9bf..780bc232 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 3b01ac3c..68c417c9 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 d591f3a6..4a85a25b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8292e006..0d9a34f7 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 acd4a36f..7f52ac59 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 de6ee890..d5c8460e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 bb49a0ca..b29516ac 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4d3c0488..260e6d9d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 393b6837..a857c69c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 cc872bec..590381f1 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 1b801ac1..b502fec9 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 f17029e6..710aa47e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 f378f3c5..8c076398 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 b3cee85e..466668c0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 6eb83cea..3f887a36 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8dd12de9..5f0a3206 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 af69b59b..505f5c6c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 8a00b752..93118fb8 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 b54d630e..a60b3756 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 4bb9e6d5..e4307ea2 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 fe755f77..6b405cd3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 db617714..285d498f 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S and others. + * Copyright (c) 2018-2019 Thales Global Services S.A.S and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 d6e57242..b16bf5a6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8574d46b..d35adc63 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 8515e5b4..938e0f9f 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 641a4e47..26962958 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ 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 914a784d..8a2b1412 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 8c9979ab..cfa04422 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 ef9f3485..51f4ce70 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 a7d1dcca..1313642d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 46319b52..d3685dfa 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 eb781157..8bbc6709 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 c0a64fd4..a712170e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 648fe31e..e205cf2c 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2018 Thales Global Services S.A.S. + * Copyright (c) 2018-2019 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/ 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 7cce60db..7b28d59d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S and others. + * Copyright (c) 2010-2019 Thales Global Services S.A.S and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 5ef055b4..5146c3d5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 c6d2a19a..14728606 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 be4bb3a0..1454852b 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 eb1a87d4..542a9490 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 aba2f4ab..47e29e69 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 f155eb77..9c868b64 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 d452fe2f..089a605e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 f6e9e6cd..64f05ce0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 213f10c7..9cc178e3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 4da3dd7b..bfb449db 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 7fe2b0ed..9c8af0c6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 0972f3b1..2b8e7a9e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 ca0d4964..f64ba368 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 04068a51..4e56b556 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 58b23569..55250176 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 71a4d291..d7f0d978 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a0e9897f..204e2216 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2014-2018 Thales Global Services S.A.S. + * Copyright (c) 2014-2019 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/ 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 fb605fe1..cced60de 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8d85184b..220e1f94 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 03696933..d03194ff 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8f90f55b..e0c4d2ea 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Intel Corporation and others. + * Copyright (c) 2017-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 fcd1afc2..a6e2aa44 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Intel Corporation and others. + * Copyright (c) 2017-2019 Intel Corporation and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 866d9e06..47b80091 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S and others. + * Copyright (c) 2010-2019 Thales Global Services S.A.S and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ 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 e07667bb..678db6b3 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 663be463..35beacea 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 6ffe7c44..13e71966 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 e92d49d7..b950c0f6 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 e7401ef6..59b19c86 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 75af0de5..40d88172 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 3819b2c3..85ad34fa 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 eba527f8..038df179 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 a62dd191..74845aa5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ 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 469f2039..2971ca55 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 4fd367e7..dd8dbd0a 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ 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 3a325826..3362526d 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2016-2018 Thales Global Services S.A.S. + * Copyright (c) 2016-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/build.properties b/plugins/org.eclipse.emf.diffmerge/build.properties index 9f9debc7..0dba0e31 100644 --- a/plugins/org.eclipse.emf.diffmerge/build.properties +++ b/plugins/org.eclipse.emf.diffmerge/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/plugin.properties b/plugins/org.eclipse.emf.diffmerge/plugin.properties index 8b883736..fc7fb520 100644 --- a/plugins/org.eclipse.emf.diffmerge/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/plugin.xml b/plugins/org.eclipse.emf.diffmerge/plugin.xml index 97949d2b..88bcbc78 100644 --- a/plugins/org.eclipse.emf.diffmerge/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge/plugin.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <!-- - Copyright (c) 2010-2018 Thales Global Services S.A.S. + Copyright (c) 2010-2019 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/ 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 797caf41..6e1dbb70 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 a385ac67..d8142db0 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 da3c38e1..93b63177 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4ccbee73..63688eff 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 42c82ec8..63bb9c76 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 2e031829..1c1e2538 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 1dd99ecb..7f735c03 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8876669c..0ee410f5 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 8ad96a1f..9a0cd9f9 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 817e8f7e..fb37ee56 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 4000e56e..1a275c17 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 81a47bc3..ee5c3336 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 3dcdc80f..6f058dc7 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ 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 682d08c5..93db406e 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,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java index bfa88b67..02c455bf 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EReferenceValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java index 61a6c020..54a00317 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EValuePresence.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataFactoryImpl.java index dd30ccdb..2e675109 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataFactoryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataFactoryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java index 6f8778f1..69f64fc8 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/DiffdataPackageImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java index 596d8c76..f55e1826 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EAttributeValuePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java index 0d8aba1a..ef1d4767 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EComparisonImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java index 980f4e2c..2c2431ee 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementPresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java index 6d1dcf3b..1b5592e3 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMappingImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java index a4ba4c9e..881e35b9 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java index 7f49208c..149f9b43 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EReferenceValuePresenceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ElementToDifferenceEntryImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ElementToDifferenceEntryImpl.java index ec8bab85..d01e6734 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ElementToDifferenceEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ElementToDifferenceEntryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ReferenceToElementToDifferenceEntryImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ReferenceToElementToDifferenceEntryImpl.java index dd829d68..df1ec59d 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ReferenceToElementToDifferenceEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ReferenceToElementToDifferenceEntryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java index 55e619e7..1af18e96 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataAdapterFactory.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceFactoryImpl.java index 4846f8ef..70846a43 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceFactoryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceFactoryImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceImpl.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceImpl.java index 62e0fa3a..48607d07 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceImpl.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataResourceImpl.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java index 2abaebd5..7dddeb9b 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/util/DiffdataSwitch.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MatchOperation.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MatchOperation.java index 3cbc7931..5b93cecc 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MatchOperation.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MatchOperation.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ComparisonConfigurator.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ComparisonConfigurator.java index bc447572..630f5f62 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ComparisonConfigurator.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ComparisonConfigurator.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2017-2018 Thales Global Services S.A.S. + * Copyright (c) 2017-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableDiffPolicy.java index 9b2a7f96..214f403b 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableDiffPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableDiffPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMatchPolicy.java index 160148c5..42627aef 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMatchPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMatchPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMergePolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMergePolicy.java index d2de44de..e7a4486a 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMergePolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/ConfigurableMergePolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2013-2018 Thales Global Services S.A.S. + * Copyright (c) 2013-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultDiffPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultDiffPolicy.java index ad95d580..67ed62b0 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultDiffPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultDiffPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMatchPolicy.java index a8ecb497..cf9aceb0 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMatchPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMatchPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMergePolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMergePolicy.java index ee195677..c2345660 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMergePolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/DefaultMergePolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/MapBasedMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/MapBasedMatchPolicy.java index dfefe85b..18038b3d 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/MapBasedMatchPolicy.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/MapBasedMatchPolicy.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractEditableModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractEditableModelScope.java index 91c12df6..f83ea363 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractEditableModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractEditableModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java index 62dd17d8..a047d27a 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/DynamicUniqueListIterator.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/DynamicUniqueListIterator.java index 93957550..d5525dc2 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/DynamicUniqueListIterator.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/DynamicUniqueListIterator.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FilteredModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FilteredModelScope.java index fdea990e..8bf81f16 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FilteredModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FilteredModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java index 8517c714..b4609648 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/ModelScopeIterator.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/ModelScopeIterator.java index ec508ded..f09a92d4 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/ModelScopeIterator.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/ModelScopeIterator.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/MultiResourceTreeIterator.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/MultiResourceTreeIterator.java index ff2cd066..1d4be0ce 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/MultiResourceTreeIterator.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/MultiResourceTreeIterator.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/RootedModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/RootedModelScope.java index f5e5a1da..001d9e91 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/RootedModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/RootedModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/SubtreeModelScope.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/SubtreeModelScope.java index 64e442fe..1b4890a0 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/SubtreeModelScope.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/SubtreeModelScope.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/messages.properties b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/messages.properties index 8279922f..f7cb2e25 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/messages.properties +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/messages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010-2018 Thales Global Services S.A.S. +# Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelImplUtil.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelImplUtil.java index c86e5855..41fd3321 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelImplUtil.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelImplUtil.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ diff --git a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelsUtil.java b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelsUtil.java index 3b0949c7..5c149ea0 100644 --- a/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelsUtil.java +++ b/plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/ModelsUtil.java @@ -1,5 +1,5 @@ /********************************************************************* - * Copyright (c) 2010-2018 Thales Global Services S.A.S. + * Copyright (c) 2010-2019 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/ |