Bug 536144 - [EMF Facet] validation of a custom file must be improved

- Change the directory of the generated code, move it to src-gen

Change-Id: I1cae153f3f45d5fa9c2fe7b7a4d80e6f0308a61c
Signed-off-by: Patrick Tessier <patrick.tessier@cea.fr>

115 files changed, 9 insertions, 7 deletions

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
index a9ea7f2801e..f277f88cbf2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.metamodel.custompt,
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
index b83af8bceed..0807706fcfd 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.metamodel</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
index 64c5e31b7a2..1bdc2a0ba05 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
index a2f13e6ef08..b86968ff295 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.emf.core;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
index 77dc4893d7b..7f2359bc3fe 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/build.properties
@@ -21,6 +21,7 @@ bin.includes = .,\
                OSGI-INF/,\
                about.html
 jars.compile.order = .
-source.. = src/
+source.. = src-gen/
 output.. = bin/
-src.includes = about.html
+src.includes = about.html,\
+               src-gen/
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
index 91db0043ded..bd31b58cd51 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011-2012 Mia-Software.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; Gregoire Dupe (Mia-Software) - Design&#xA; Nicolas Guyomar (Mia-Software) - Implementation&#xA; Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non derived facet structural features and save them values. &#xA; Nicolas Bros (Mia-Software) - Bug 361823 - [Restructuring] eFacet2 meta-model&#xA; Gregoire Dupe (Mia-Software) - Bug 366055 - NavigationQuery&#xA; Gregoire Dupe (Mia-Software) - Bug 369673 - [Facet] IsOneOfQuery&#xA; Olivier Remaud (Soft-Maint) - Bug 369824 - Add a simple way to return string literal constants from a customization query&#xA; Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework&#xA; Gregoire Dupe (Mia-software) - Bug 364325 - [Restructuring] The user must be able to navigate into a model using the Facet.&#xA; Nicolas Bros (Mia-Software) - Bug 372626 - [Facet] Aggregates&#xA; Nicolas Bros (Mia-Software) - Bug 376941 - [EFacet] Facet operation arguments in Facet model&#xA; Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet"
-    modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.metamodel/src" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.metamodel"
+    modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.metamodel"
     modelName="Efacet2" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language=""
     usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
index a2a19c68de8..80f061bf98f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
     copyrightText=" Copyright (c) 2011,2012 Mia-Software.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; Gregoire Dupe (Mia-Software) - Design&#xA; Nicolas Guyomar (Mia-Software) - Implementation&#xA; Emmanuelle Rouillé (Mia-Software) - Bug 352618 - To be able to use non-derived facet structural features and save their values.&#xA; Nicolas Bros (Mia-Software) - Bug 370110 - Rename efacetcatalog2.ecore&#xA; Grégoire Dupé (Mia-Software) - Bug 361817 - [Restructuring] Dynamic load to the facet catalog&#xA; Grégoire Dupé (Mia-Software) - Bug 373078 - API Cleaning"
-    modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.metamodel/src" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.metamodel"
+    modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.metamodel"
     modelName="Efacetcatalog" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language=""
     usedGenPackages="platform:/plugin/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Category.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Category.java
index 49378ef5ce5..49378ef5ce5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Category.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Category.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
index 69352f0b293..69352f0b293 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
index 70914c410d8..70914c410d8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
index 57b293a6841..57b293a6841 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
index 94c56dc1416..94c56dc1416 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
index 6e6769629fb..6e6769629fb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
index 0e927807ac1..0e927807ac1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
index 0b903318a60..0b903318a60 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
index 7fcbe4b868e..7fcbe4b868e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
index 88df7a67994..88df7a67994 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
index 2b8b328c8ab..2b8b328c8ab 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
index 3c9d2b9782e..3c9d2b9782e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
index 4719752ca8e..4719752ca8e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
index b887bf8bcb8..b887bf8bcb8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
index 1d90ae9ae37..1d90ae9ae37 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
index 0c372d96338..0c372d96338 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
index e4bae29fc80..e4bae29fc80 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
index 809c6d8e9d3..809c6d8e9d3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
index 739c559a761..739c559a761 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
index dc3879f5dcb..dc3879f5dcb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
index 391a7ca265c..391a7ca265c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
index ce1340e1979..ce1340e1979 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
index 2b2f4f5f011..2b2f4f5f011 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
index 41e6a607b71..41e6a607b71 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
index e258220b696..e258220b696 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
index 7eb738e85ce..7eb738e85ce 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
index 693b843ac26..693b843ac26 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
index ca9a6433929..ca9a6433929 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
index fc23d0e9adb..fc23d0e9adb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
index f64a6f00fe4..f64a6f00fe4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
index 6b9bc0f05c5..6b9bc0f05c5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
index 6e931e14dcb..6e931e14dcb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
index 6eb58087307..6eb58087307 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
index 9f9a9f1e5a0..9f9a9f1e5a0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
index 399dba0e702..399dba0e702 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
index 0dccf2f6852..0dccf2f6852 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
index cc156fae86d..cc156fae86d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
index 8534e3a7be2..8534e3a7be2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
index 0ea4a7d48d1..0ea4a7d48d1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
index d115ec1f2f7..d115ec1f2f7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
index fc7bb8906f3..fc7bb8906f3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
index 176fc5f3639..176fc5f3639 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
index 15a97824b4c..15a97824b4c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
index 0f7703f61b0..0f7703f61b0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
index 5a9e4bcbc2e..5a9e4bcbc2e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
index 442ec4bb464..442ec4bb464 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
index 83a6b7930aa..83a6b7930aa 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
index faa21d37fde..faa21d37fde 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
index e9e1bede21c..e9e1bede21c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
index 0edf41c0aac..0edf41c0aac 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
index e1ff1581ee3..e1ff1581ee3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
index 97a7fffcbb8..97a7fffcbb8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
index 7150fbfc7de..7150fbfc7de 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
index 5438d29d74e..5438d29d74e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
index e59a044941e..e59a044941e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
index 2f90873ccc5..2f90873ccc5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
index f1ddf493454..f1ddf493454 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
index f097d5b093e..f097d5b093e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
index 9d6f2a3d1fc..9d6f2a3d1fc 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
index cdd9568381c..cdd9568381c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
index fab5244e04e..fab5244e04e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
index 0b823b93d5e..0b823b93d5e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
index 0ee35384c16..0ee35384c16 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
index 7d27163fd38..7d27163fd38 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
index 08dc0b7ae23..08dc0b7ae23 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
index c5cbfe63a72..c5cbfe63a72 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
index de4fdfe9b43..de4fdfe9b43 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
index ca48ce1a648..ca48ce1a648 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
index d8e23ebae10..d8e23ebae10 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
index 805fc041582..805fc041582 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
index c8f2e150f92..c8f2e150f92 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
index b87f47ad63b..b87f47ad63b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
index 66a4ebfc687..66a4ebfc687 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
index 4b9acec8fb3..4b9acec8fb3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
index b57d012e3da..b57d012e3da 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
index c2fbdd44478..c2fbdd44478 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
index 20e92809511..20e92809511 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
index 07f4536fd28..07f4536fd28 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
index 96e91ec02e5..96e91ec02e5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
index e409635439a..e409635439a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
index 0d446c2bc1b..0d446c2bc1b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
index 3b406cfd479..3b406cfd479 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
index 01bfc660539..01bfc660539 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
index 2205021faa4..2205021faa4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
index 95f80ffa06a..95f80ffa06a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
index 30e4452e11b..30e4452e11b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
index 2246a2a74ac..2246a2a74ac 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
index 371ab5f7fb0..371ab5f7fb0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
index 43393861ec8..43393861ec8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
index 9c1c99025ca..9c1c99025ca 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
index fab2e3e119f..fab2e3e119f 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
index ab1f36dca8d..ab1f36dca8d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
index 4587ded753b..4587ded753b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
index 82c3ffb707e..82c3ffb707e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
index 1489a47e190..1489a47e190 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
index 7592368ad7d..7592368ad7d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
index 30f7d9c0141..30f7d9c0141 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
index 89b305015be..89b305015be 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
index acdd785a98e..acdd785a98e 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
index 6e07ee8ef93..6e07ee8ef93 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
index 37528132b4b..37528132b4b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
index a5b7b5415a3..a5b7b5415a3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
index 028d0fc74de..028d0fc74de 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
index 8ab2c9b6373..8ab2c9b6373 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
index 6a7b350b816..6a7b350b816 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
index 561b91f822d..561b91f822d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
index b24c46f1bd0..b24c46f1bd0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java
index 28f1a724cf5..28f1a724cf5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src-gen/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java