diff options
| author | Olivier Constant | 2018-09-07 04:57:41 -0400 |
|---|---|---|
| committer | Olivier Constant | 2018-09-07 10:27:43 -0400 |
| commit | 7b0d16d99b5a230af0e14d2d15766faeb2dc482c (patch) | |
| tree | 6da33ae5cad3796ff24c67eb957bb308370923b5 /plugins | |
| parent | 306529ac44c8e6fc0398de8048d2f7865c2b253e (diff) | |
| download | org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.gz org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.xz org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.zip | |
Bug 535213 - Switch to EPL-2.0
Change-Id: Iaff61bc806c4918e58f96ce865d69940cfb3cf78
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'plugins')
134 files changed, 687 insertions, 543 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF index 001097c..d41500b 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF @@ -22,4 +22,5 @@ Require-Bundle: org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)", Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Import-Package: org.apache.log4j;version="1.2.15" +Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.persistence.emf diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties index 3e15bee..bc5ad1a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties index ab856e0..fa835d8 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = Model Patch EMF Persistence Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml index a4f7a8f..ef581db 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend index f06a793..e5d391d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchPersister.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend index 928f965..255302d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/EMFModelPatchSerializer.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java index bf235e0..82f597f 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EAttributeEntry.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java index a04821c..902c301 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EChangeDirection.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java index b55abb1..a7be0a6 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EElementEntry.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java index 8b4a17f..2ea15bb 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EIdentifiable.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java index fdb28da..51978b1 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatch.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java index 21839b7..dae97c0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEMFMetadata.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java index 7440d6e..9b591ce 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchElement.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java index 3a586ce..62863d5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchEntry.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java index dca5be0..82e526a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchFactory.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java index 6b3209a..874c2b2 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchMetadata.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java index b88e22b..f251c14 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EModelPatchPackage.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java index c427358..d06b32c 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EReferenceEntry.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java index 432422e..9b33734 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/EStructuralFeatureEntry.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java index d53fb7a..6ccd980 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EAttributeEntryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java index f6d7a4e..905678e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EElementEntryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java index d98b3dc..ae08144 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EIdentifiableImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java index e58d611..2c805ce 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEMFMetadataImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java index a8dd79b..b39af9e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchElementImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java index cbfc863..57b512b 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchEntryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java index 2a3f914..8403106 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchFactoryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java index ee3767b..179413e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java index ea37ee6..68e7e17 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchMetadataImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java index 9c9c768..6597e2a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EModelPatchPackageImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java index 112b34a..9bc2916 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EReferenceEntryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java index fccbbf2..ad83385 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/impl/EStructuralFeatureEntryImpl.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java index 10f5744..173663e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchAdapterFactory.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java index 25f67dc..50ab020 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/emodelpatch/util/EModelPatchSwitch.java @@ -1,9 +1,10 @@ /** * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend index ad6114e..3acd270 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/EModelPatchToPOJO.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend index ff2c00d..861f703 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/src/org/eclipse/emf/diffmerge/patch/persistence/emf/transform/ModelPatchToEMF.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF index f95ed82..89bd3db 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF @@ -10,3 +10,4 @@ Require-Bundle: com.google.gson;bundle-version="2.2.4", com.google.guava;bundle-version="15.0.0" Export-Package: org.eclipse.emf.diffmerge.patch.serializer.gson Bundle-ClassPath: . +Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.persistence.json diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties index 8babb8d..b612ecb 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties index f73f543..ac06927 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = Model Patch JSON Persistence Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml index f277062..30d4ef5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java index 6bf928a..69e978e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/GsonModelPatchSerializer.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java index 35c23dc..c6d5928 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/src/org/eclipse/emf/diffmerge/patch/serializer/gson/typeadapters/AbstractSubclassAdapter.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF index 2f93190..d434310 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF @@ -18,4 +18,5 @@ Export-Package: org.eclipse.emf.diffmerge.patch.runtime, org.eclipse.emf.diffmerge.patch.runtime.identifier, org.eclipse.emf.diffmerge.patch.runtime.modelaccess Import-Package: org.apache.log4j;version="1.2.15" +Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.runtime diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html b/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html index d8e1984..720a1d0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/about.html @@ -1,21 +1,25 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> <title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2007</p> +<p>August 17, 2018</p> <h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties index 6b228af..4e20993 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties index 8d7c1ca..a3644f9 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = Model Patch Runtime Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml index d02ab8d..45fb874 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend index 152e96e..dad708e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchApplier.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend index 3fed911..5a5ce6a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFModelPatchMetadata.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend index 61af8fb..bccac31 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/EMFPatchApplication.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend index cfab380..0c4b96e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/ModelPatchRecorder.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend index 97ab090..5568b8b 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/BaseIndexEObjectLocator.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java index ae8cea1..d2b632a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EMFIdentifierProvider.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java index 3f6bf3f..a6ec453 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectIdentifierProvider.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java index d2e838f..0277d57 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/EObjectLocator.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java index acc355c..e6036bd 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IDAttributeBasedEObjectIdentifierProvider.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java index 8ed10ea..d4bd897 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/IdentifiedEMFObjectLocator.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend index 1497c03..94c5e7e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/identifier/TreeIteratorEObjectLocator.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend index c30cbcd..8fc4faa 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/AbstractEMFModleAccess.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend index 5b92ecc..ad6c400 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/EMFModelAccess.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend index baf01d3..eee48b5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java index 5e310ff..c42175d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ModelAccessTypes.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend index 8c50c7b..2d92680 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/SimpleReflectiveEMFModelAccess.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend index b7f1faa..98fc8e3 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/src/org/eclipse/emf/diffmerge/patch/runtime/modelaccess/ViatraModelAccess.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF index ec39d34..e6b3171 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF @@ -34,4 +34,5 @@ Export-Package: org.eclipse.emf.diffmerge.patch.ui, Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.diffmerge.patch.ui.ModelPatchUIPlugin Import-Package: org.apache.log4j;version="1.2.0" +Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.ui diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html b/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html index d8e1984..720a1d0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/about.html @@ -1,21 +1,25 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> <title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2007</p> +<p>August 17, 2018</p> <h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties index ef79c67..80b9294 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties index ef61b0e..5f1a886 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = Model Patch GUI Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml index 4a83ddc..e404f75 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/plugin.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml index 58b8572..232140d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java index 3bac6c1..252a24c 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/ModelPatchUIPlugin.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java index 155b968..fdaa462 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchEntryFilterCreationDialog.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java index 5270872..d010926 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/ModelpatchViewerDialog.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java index a02ab46..24b2174 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/dialogs/PluginID.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java index 600ca95..6de511f 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/editors/ModelPatchEditorPart.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend index d79b0f4..57172a5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ComparisonSelectionUtil.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend index aafa406..ee8acc5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchApplicationHandler.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend index 4afb906..0705ed7 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/handlers/ModelpatchGenerationHandler.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java index e5af756..c77e2f6 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferencePage.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java index ad85b28..65b0be2 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/preferences/ModelPatchPreferenceProvider.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend index b13cf77..cdb9994 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DefaultEntryLabelProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend index 867c1c2..54c67fa 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DescriptiveEntryLabelProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend index dc2f1ef..3bbf2f4 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/DialogFactory.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java index 9b4ddae..dd6d2d2 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/EntryPropertyWrapper.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java index fcb796f..f8ca550 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IEntryLabelProvider.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java index 69fa716..8877664 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapper.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java index 3dcd0cb..c9a1fe9 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/IdentifiableWrapperFactory.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend index e5b31fe..9f0497a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchContentProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend index 11247d3..b91ba35 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterContentProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend index 755e1b7..743b045 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryFilterLabelProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend index 5d3d2a9..defc363 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchEntryHelper.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend index f98b78c..3d6e95a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelPatchLabelProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend index c93180f..4fdfa35 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/ModelpatchApplicationDTO.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java index 29301cd..7ddfbf8 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/PersistenceTypes.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend index 534c14f..9909f7d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/utils/SerializerProvider.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend index 5f9564d..fbcde93 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/ModelpatchApplicationWizard.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java index 3d3329b..87962cc 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java index 5f4ebf2..3704f07 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchFilteringWizardPage.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java index 6f767b4..e20bb3e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchLoadingPatchWizardPage.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java index 6018040..111a63c 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchResultWizardPage.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation @@ -153,6 +154,7 @@ public class ModelpatchResultWizardPage extends WizardPage { return getChildren(inputElement); } + @SuppressWarnings("rawtypes") @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof ModelPatchDiagnosticElement) { diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java index 35f557a..016ab4b 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java +++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/wb/swt/SWTResourceManager.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2011 Google, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Google, Inc. - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF index 1730884..b066f3f 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF @@ -13,3 +13,4 @@ Export-Package: org.eclipse.emf.diffmerge.patch, org.eclipse.emf.diffmerge.patch.persistence, org.eclipse.emf.diffmerge.patch.serializer Bundle-ClassPath: . +Automatic-Module-Name: org.eclipse.emf.diffmerge.patch diff --git a/plugins/org.eclipse.emf.diffmerge.patch/about.html b/plugins/org.eclipse.emf.diffmerge.patch/about.html index d8e1984..720a1d0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/about.html +++ b/plugins/org.eclipse.emf.diffmerge.patch/about.html @@ -1,21 +1,25 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> <title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> <h2>About This Content</h2> -<p>June 5, 2007</p> +<p>August 17, 2018</p> <h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.diffmerge.patch/build.properties b/plugins/org.eclipse.emf.diffmerge.patch/build.properties index 909ef3f..89387f3 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties index ff2dfcc..5e37462 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.patch/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2016-2017 Thales Global Services S.A.S. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = Model Patch Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml index 7384c2b..6838067 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/pom.xml +++ b/plugins/org.eclipse.emf.diffmerge.patch/pom.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2016-2017 Thales Global Services S.A.S. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + Copyright (c) 2016-2017 Thales Global Services S.A.S. + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java index 92f2b7e..d9d4435 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AbstractModelPatchEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java index c3b33e5..0e404ec 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/AttributeEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java index be123df..e4aa3e0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ElementEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java index 0ddb606..3ef7646 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/ReferenceEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java index 61c9f70..4e446ca 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/StructuralFeatureEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java index bfac620..2aa8f6f 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/BaseModelPatchMetadata.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java index 2e1f7b4..5c271e5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ChangeDirection.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java index aa72623..e414260 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ComplexMPEFilterType.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java index 1081610..2e56e52 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/EntryType.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java index e1a7710..78015d8 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/IModelPatchEntryFilter.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java index dd3b719..3c9328e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/Identifiable.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java index ff00ca2..8fbf52a 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatch.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java index 5934a3f..05a3ee7 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchBuilder.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend index a74e9ff..e2ef1d5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchDiagnosticElement.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java index 841778f..840d399 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntry.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java index edf8a9a..6d3160e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryBuilder.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java index 2d83d2e..ecadbd4 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchEntryProperty.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java index 4fe25cb..c706c1d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchException.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend index a8329e2..58926e2 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchFilterApplier.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java index 6034206..2d66313 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchMetadata.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend index ff7c6a7..b3a221d 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/ModelPatchReverser.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend index 5b95dd0..40c1db5 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplication.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java index 10044bb..878fc02 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/PatchApplicationDiagnostic.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend index 4500fb7..e75af3c 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/ComplexEntryFilter.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend index e413898..433994e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryDirectionFilter.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend index fd090ee..be47216 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryPropertyFilter.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend index 9443819..5fbecd0 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/api/filters/EntryTypeFilter.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017, Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend index 0c0035c..5e49f3e 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/persistence/ModelPatchPersister.xtend @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java index 77cf07f..1d29f40 100644 --- a/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java +++ b/plugins/org.eclipse.emf.diffmerge.patch/src/org/eclipse/emf/diffmerge/patch/serializer/IModelPatchSerializer.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2016-2017 Thales Global Services S.A.S. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation |