Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 15:18:52 +0000
committerOlivier Constant2018-09-07 15:44:21 +0000
commitdb2cef94c1863d0e6452ed33fda5f0e2329b5616 (patch)
tree12184688eba434cffb311587b78f77fe73521b71 /tests/org.eclipse.emf.diffmerge.structures.model
parentf5683739559038156728caa0dfe5587a10b000f4 (diff)
downloadorg.eclipse.emf.diffmerge.core-db2cef94c1863d0e6452ed33fda5f0e2329b5616.tar.gz
org.eclipse.emf.diffmerge.core-db2cef94c1863d0e6452ed33fda5f0e2329b5616.tar.xz
org.eclipse.emf.diffmerge.core-db2cef94c1863d0e6452ed33fda5f0e2329b5616.zip
Bug 538800 - Upgrade version to 0.11.0
- diffmerge.core Change-Id: I150287451def2fc22b9889edaef25d110db37b39 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests/org.eclipse.emf.diffmerge.structures.model')
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraph.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsFactory.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsPackage.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EHyperEdge.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/ENode.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsPackageImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EHyperEdgeImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/ENodeImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsAdapterFactory.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceFactoryImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceImpl.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsSwitch.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpact.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpactExploredSubset.java2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/GraphQBinaryRelation.java2
18 files changed, 18 insertions, 18 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
index d4170eda..2f26cfa0 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 0.11.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraph.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraph.java
index 57fdc052..38b81529 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraph.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraph.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsFactory.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsFactory.java
index 9f600328..f5897ca3 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsFactory.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsFactory.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsPackage.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsPackage.java
index dec4e1f4..8fa914f7 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsPackage.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EGraphsPackage.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EHyperEdge.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EHyperEdge.java
index 7c1390a6..b64d05ca 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EHyperEdge.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/EHyperEdge.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/ENode.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/ENode.java
index 964fc4a2..3a507b9c 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/ENode.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/ENode.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphImpl.java
index 9ee6bf64..70ebba3c 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsFactoryImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsFactoryImpl.java
index 0ebe4e87..3f698e61 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsFactoryImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsFactoryImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsPackageImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsPackageImpl.java
index 12bc5fea..944cbfe9 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsPackageImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EGraphsPackageImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EHyperEdgeImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EHyperEdgeImpl.java
index fe107ddf..29639d73 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EHyperEdgeImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/EHyperEdgeImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/ENodeImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/ENodeImpl.java
index 69671b1f..2a8ec0e9 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/ENodeImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/impl/ENodeImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsAdapterFactory.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsAdapterFactory.java
index 2450ac13..f6ca6e7b 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsAdapterFactory.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsAdapterFactory.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceFactoryImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceFactoryImpl.java
index 4b2fe5de..70ed2726 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceFactoryImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceFactoryImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceImpl.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceImpl.java
index 220e47e3..4fcc520f 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceImpl.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsResourceImpl.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsSwitch.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsSwitch.java
index bb8a78d8..5b080db5 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsSwitch.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/egraphs/util/EGraphsSwitch.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpact.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpact.java
index 9ac7d23b..ae7db2fa 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpact.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpact.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpactExploredSubset.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpactExploredSubset.java
index d6bb2d5a..1c5b058c 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpactExploredSubset.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/EImpactExploredSubset.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/GraphQBinaryRelation.java b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/GraphQBinaryRelation.java
index 2b7b582c..65d7a943 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/GraphQBinaryRelation.java
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/src/org/eclipse/emf/diffmerge/structures/model/integration/GraphQBinaryRelation.java
@@ -1,5 +1,5 @@
/*********************************************************************
- * Copyright (c) 2017 Thales Global Services S.A.S.
+ * Copyright (c) 2017-2018 Thales Global Services S.A.S.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/

Back to the top