Bug 512120 - [Extra] Archive facade

- remove plugins org.eclipse.papyrus.facade.** from the build

Change-Id: I5effd8d0a0608ce932c1ee0d44264478e86649b2
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

313 files changed, 0 insertions, 52609 deletions

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath
deleted file mode 100644
index 5496d8e7f08..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src-templates"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project
deleted file mode 100644
index b44c0bf785d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade.codegen</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>

-			<arguments>

-				<dictionary>

-					<key>compliance</key>

-					<value>pragmatic</value>

-				</dictionary>

-				<dictionary>

-					<key>resource.kind</key>

-					<value>binary</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 11f6e462df7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
deleted file mode 100644
index 851853bb3a8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.facade.codegen.genfacade,

- org.eclipse.papyrus.facade.codegen.utils

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.eef.codegen.launcher,

- org.eclipse.core.resources,

- org.eclipse.emf.common,

- org.eclipse.emf.codegen.ecore,

- org.eclipse.acceleo.engine,

- org.eclipse.emf.eef.codegen.ecore;bundle-version="1.2.0",

- org.eclipse.papyrus.facade;bundle-version="1.2.0",

- org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.facade.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"

-Bundle-Vendor: %vendorName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade.codegen;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/about.html b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo
deleted file mode 100644
index 927a3f72b52..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets.                                                       -->
-<!-- Set customBuildCallbacks = build.acceleo in your build.properties.    -->
-<!-- ===================================================================== -->
-<project name="Build Acceleo Module" default="noDefault">    
-    <!-- ================================================================= -->
-    <!-- Default target                                                    -->
-    <!-- ================================================================= -->
-    <target name="noDefault">
-        <echo message="This file must be called with explicit targets" />
-    </target>
-
-    <!-- ================================================================= -->
-    <!-- This will be called automatically after the compilation of each   -->
-    <!-- Bundle... in dependency order.                                    -->
-    <!-- ================================================================= -->
-    <target name="post.compile.@dot">
-        <acceleoCompiler 
-            sourceFolder="${target.folder}"
-            outputFolder="${target.folder}"
-            dependencies="${target.folder}/../../org.eclipse.emf.eef.codegen.ecore;${target.folder}/../../org.eclipse.ui.ide;${target.folder}/../../org.eclipse.papyrus.facade;${target.folder}/../../org.eclipse.uml2.uml;${target.folder}/../../org.eclipse.uml2.codegen.ecore;${target.folder}/../../org.eclipse.papyrus.facade.utils;"
-            binaryResource="false"
-            packagesToRegister="">
-        </acceleoCompiler>
-    </target>    
-</project>
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties
deleted file mode 100644
index c64e3a2018b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src-templates/,\

-           src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               src/,\

-               icons/,\

-               plugin.properties,\

-               about.html

-src.includes = about.html

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png
deleted file mode 100644
index 779a7b8b123..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties
deleted file mode 100644
index 3525155d7dc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=Papyrus Facade CodeGen (Incubation)

-vendorName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
deleted file mode 100644
index bda059b0aab..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   

-    <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.facade.category"

-            id="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"

-            name="Generate Facade Code">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.facade.codegen.handlers.GenerateFacadeHandler"

-            commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand">

-      </handler>

-   </extension>

- 

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="popup:org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditorID">

-            <command

-                  commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"

-                  icon="icons/facade.png"

-                  id="org.eclipse.papyrus.facade.codegen.menu.generateFacadeCodeCommand">

- 

-                    <visibleWhen>

-				           <with variable="activeMenuSelection">

-				            <iterate

-				                 ifEmpty="false">

-				             <adapt type="org.eclipse.emf.codegen.ecore.genmodel.GenModel">

-

-				             </adapt>

-				            </iterate>

-				           </with>

-         			</visibleWhen>

-            </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/pom.xml
deleted file mode 100644
index 641946e74d3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade.codegen</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.2.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl
deleted file mode 100644
index 1c550f7422d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl
+++ /dev/null
@@ -1,130 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module eIsSet('http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
-
-[template public eIsSet(genClass : GenClass, genModel : GenModel, positiveOffsetCorrection : String, negativeOffsetCorrection : String)]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useGenerics()) ]
-    [if (genClass.getEIsSetGenFeatures()->filter(GenFeature)->select(genFeature : GenFeature | genFeature.isListType() and not genFeature.isUnsettable() and not genFeature.isWrappedFeatureMapType() and not genClass.isField(genFeature) and genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()))->notEmpty()]
-	@SuppressWarnings("unchecked")
-    [/if]
-  [/if]
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public boolean eIsSet(int featureID) {
-		switch (featureID[negativeOffsetCorrection/]) {
-[for (genFeature : GenFeature  | genClass.getEIsSetGenFeatures())]
-  [let safeNameAccessor : String = if (genFeature.getSafeName() = 'featureID') then 'this.' + genFeature.getSafeName() else genFeature.getSafeName() endif]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-  [if (genFeature.hasSettingDelegate()) ]
-    [if (genFeature.isUnsettable()) ]
-				return isSet[genFeature.getAccessorName()/]();
-    [else]
-				return [genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
-    [/if]
-  [else][if (genFeature.isListType() and not genFeature.isUnsettable()) ]
-    [if (genFeature.isWrappedFeatureMapType()) ]
-      [if (genFeature.isVolatile()) ]
-				return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap().isEmpty();
-      [else]
-				return [genFeature.getGetAccessor()/]() != null && ![genFeature.getGetAccessor()/]().featureMap().isEmpty();
-      [/if]
-    [else]
-      [if (genClass.isField(genFeature)) ]
-				return [genFeature.getGetAccessor()/]() != null && ![genFeature.getGetAccessor()/]().isEmpty();
-      [else]
-        [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				[genFeature.getImportedType(genClass)/] [safeNameAccessor/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-				return [safeNameAccessor/] != null && ![safeNameAccessor/].isEmpty();
-        [else]
-				return ![genFeature.getGetAccessor()/]().isEmpty();
-        [/if]
-      [/if]
-    [/if]
-  [else][if (genFeature.isUnsettable()) ]
-				return isSet[genFeature.getAccessorName()/]();
-  [else][if (genFeature.isResolveProxies()) ]
-    [if (genClass.isField(genFeature)) ]
-				return [genFeature.getGetAccessor()/]() != null;
-    [else]
-      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]) != null;
-      [else]
-				return basicGet[genFeature.getAccessorName()/]() != null;
-      [/if]
-    [/if]
-  [else][if (not genFeature.hasEDefault()) ]
-    [if (genClass.isField(genFeature)) ]
-				return [genFeature.getGetAccessor()/]() != null;
-    [else]
-      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]) != null;
-      [else]
-				return [genFeature.getGetAccessor()/]() != null;
-      [/if]
-    [/if]
-  [else][if (genFeature.isPrimitiveType() or genFeature.isEnumType()) ]
-    [if (genClass.isField(genFeature)) ]
-      [if (genClass.isFlag(genFeature)) ]
-        [if (genFeature.isBooleanType()) ]
-				return (([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0) != [genFeature.getEDefault()/];
-        [else]
-				return ([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != [genFeature.getUpperName()/]_EFLAG_DEFAULT;
-        [/if]
-      [else]
-				return [genFeature.getGetAccessor()/]() != [genFeature.getEDefault()/];
-      [/if]
-    [else]
-      [if (genFeature.isEnumType() and genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [genFeature.getEDefault()/]) != [genFeature.getEDefault()/];
-      [else]
-				return [genFeature.getGetAccessor()/]() != [genFeature.getEDefault()/];
-      [/if]
-    [/if]
-  [else]
-    [if (genClass.isField(genFeature)) ]
-				return [genFeature.getEDefault()/] == null ? [genFeature.getGetAccessor()/]() != null : ![genFeature.getEDefault()/].equals([genFeature.getGetAccessor()/]());
-    [else]
-      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				[genFeature.getImportedType(genClass)/] [safeNameAccessor/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [genFeature.getEDefault()/]);
-				return [genFeature.getEDefault()/] == null ? [safeNameAccessor/] != null : ![genFeature.getEDefault()/].equals([safeNameAccessor/]);
-      [else]
-				return [genFeature.getEDefault()/] == null ? [genFeature.getGetAccessor()/]() != null : ![genFeature.getEDefault()/].equals([genFeature.getGetAccessor()/]());
-      [/if]
-    [/if]
-  [/if][/if][/if][/if][/if][/if]
-  [/let]
-[/for]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eIsSet(featureID);
-[else]
-		return eDynamicIsSet(featureID);
-[/if]
-	}
-
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl
deleted file mode 100644
index b6d0ecd3c59..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl
+++ /dev/null
@@ -1,54 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module eUnset('http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-
-[template public eUnset(genClass : GenClass, genModel : GenModel, negativeOffsetCorrection : String)]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public void eUnset(int featureID) {
-		switch (featureID[negativeOffsetCorrection/]) {
-  [for (genFeature : GenFeature | genClass.getEUnsetGenFeatures())]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-    [if (genFeature.isListType() and not genFeature.isUnsettable()) ]
-      [if (genFeature.isWrappedFeatureMapType()) ]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap().clear();
-      [else]
-				[genFeature.getGetAccessor()/]().clear();
-      [/if]
-    [else][if (genFeature.isUnsettable()) ]
-				unset[genFeature.getAccessorName()/]();
-    [else][if (not genFeature.hasEDefault()) ]
-				set[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])null);
-    [else]
-				set[genFeature.getAccessorName()/]([genFeature.getEDefault()/]);
-    [/if][/if][/if]
-				return;
-  [/for]
-		}
-  [if (genModel.minimalReflectiveMethods) ]
-		super.eUnset(featureID);
-  [else]
-		eDynamicUnset(featureID);
-  [/if]
-	}
-
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl
deleted file mode 100644
index 39960920800..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl
+++ /dev/null
@@ -1,206 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module genDeclaredFields('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-
-[template public genDeclaredFields(genFeature : GenFeature, genClass : GenClass, genModel : GenModel, isGWT : Boolean, isJDK50 : Boolean)]
-    [if (genFeature.hasSettingDelegate())]
-	/**
-	 * The cached setting delegate for the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-      [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-      [/if]
-	protected [genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Internal.SettingDelegate [genFeature.getUpperName()/]__ESETTING_DELEGATE = (([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Internal)[genFeature.getQualifiedFeatureAccessor()/]).getSettingDelegate();
-
-    [else][if (genFeature.isListType() or genFeature.isReferenceType())]
-      [if (genClass.isField(genFeature)) ]
-	/**
-	 * The cached value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-        [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-        [/if]
-	protected [genFeature.getImportedInternalType(genClass)/] [genFeature.getSafeName()/];
-
-      [/if]
-      [if (genModel.arrayAccessors and genFeature.isListType() and not genFeature.isFeatureMapType() and not genFeature.isMapType())]
-        [let rawListItemType : String = genFeature.getRawListItemType()]
-          [let index : Integer = rawListItemType.index('[')]
-            [let head : String = if (index <> -1) then rawListItemType.substring(1, index) else rawListItemType endif]
-              [let tail : String = if (index <> -1) then rawListItemType.substring(index + 1) else '' endif]
-	/**
-	 * The empty value for the '{@link #[genFeature.getGetArrayAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' array accessor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetArrayAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-        [if (genFeature.getQualifiedListItemType(genClass).contains('<')) ]
-	@SuppressWarnings("unchecked")
-        [/if]
-	protected static final [rawListItemType/]['[]'/] [genFeature.getUpperName()/]_EEMPTY_ARRAY = new [head/] ['[0]'/][tail/];
-                
-              [/let]
-            [/let]
-          [/let]
-        [/let]
-      [/if]
-    [else]
-      [if (genFeature.hasEDefault() and (not genFeature.isVolatile() or not genModel.reflectiveDelegation and (not genFeature.hasDelegateFeature() or not genFeature.isUnsettable())))]
-        [let staticDefaultValue : String = genFeature.getStaticDefaultValue()]
-	/**
-	 * The default value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-        [if (genModel.useGenerics() and genFeature.isListDataType() and genFeature.isSetDefaultValue()) ]
-	@SuppressWarnings("unchecked")
-        [/if]
-	protected static final [genFeature.getImportedType(genClass)/] [genFeature.getEDefault()/][if (staticDefaultValue = '') ]; // TODO The default value literal "[genFeature.ecoreFeature.defaultValueLiteral/]" is not valid.[else] = [staticDefaultValue/];[genModel.getNonNLS(staticDefaultValue)/][/if]
-
-        [/let]
-      [/if]
-      [if (genClass.isField(genFeature)) ]
-        [if (genClass.isFlag(genFeature))]
-          [let flagIndex : Integer = genClass.getFlagIndex(genFeature)]
-            [if (flagIndex > 31 and flagIndex.mod(32) = 0)]
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-              [if (isGWT)]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-              [/if]
-	protected int [genClass.getFlagsField(genFeature)/] = 0;
-
-            [/if]
-            [if (genFeature.isEnumType())]
-	/**
-	 * The offset of the flags representing the value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int [genFeature.getUpperName()/]_EFLAG_OFFSET = [flagIndex.mod(32)/];
-
-	/**
-	 * The flags representing the default value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int [genFeature.getUpperName()/]_EFLAG_DEFAULT = [if (isJDK50) ][genFeature.getEDefault()/].ordinal()[else][genFeature.getImportedType(genClass)/].VALUES.indexOf([genFeature.getEDefault()/])[/if] << [genFeature.getUpperName()/]_EFLAG_OFFSET;
-
-	/**
-	 * The array of enumeration values for '{@link [genFeature.getImportedType(genClass)/] [genFeature.getTypeGenClassifier().getFormattedName()/]}'
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	private static final [genFeature.getImportedType(genClass)/]['[]'/] [genFeature.getUpperName()/]_EFLAG_VALUES = [if (isJDK50) ][genFeature.getImportedType(genClass)/].values()[else]([genFeature.getImportedType(genClass)/]['[]'/])[genFeature.getImportedType(genClass)/].VALUES.toArray(new [genFeature.getImportedType(genClass)/]['['/][genFeature.getImportedType(genClass)/].VALUES->size()])[/if];
-
-            [/if]
-	/**
-	 * The flag[if genClass.getFlagSize(genFeature) > 1]s[/if] representing the value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int [genFeature.getUpperName()/]_EFLAG = [genClass.getFlagMask(genFeature)/] << [if (genFeature.isEnumType()) ][genFeature.getUpperName()/]_EFLAG_OFFSET[else][flagIndex.mod(32)/][/if];
-
-          [/let]
-        [else]
-	/**
-	 * The cached value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 * @ordered
-	 */
-          [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-          [/if]
-	protected [genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/][if (genFeature.hasEDefault()) ] = [genFeature.getEDefault()/][/if];
-
-        [/if]
-      [/if]
-    [/if][/if]
-    [if (genClass.isESetField(genFeature)) ]
-      [if (genClass.isESetFlag(genFeature))]
-        [let flagIndex : Integer = genClass.getESetFlagIndex(genFeature)]
-          [if (flagIndex > 31 and flagIndex.mod(32) = 0) ]
-	/**
-	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-            [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-            [/if]
-	protected int [genClass.getESetFlagsField(genFeature)/] = 0;
-
-          [/if]
-	/**
-	 * The flag representing whether the [genFeature.getFormattedName()/] [genFeature.getFeatureKind()/] has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int [genFeature.getUpperName()/]_ESETFLAG = 1 << [flagIndex.mod(32) /];
-        [/let]
-      [else]
-	/**
-	 * This is true if the [genFeature.getFormattedName()/] [genFeature.getFeatureKind()/] has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-        [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-        [/if]
-	protected boolean [genFeature.getUncapName()/]ESet;
-
-      [/if]
-    [/if]
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl
deleted file mode 100644
index c59f69608be..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl
+++ /dev/null
@@ -1,902 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module genFeature('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
-[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
-[import org::eclipse::papyrus::facade::codegen::utils::WrappingListUtils /]
-[import org::eclipse::emf::eef::codegen::ecore::model::FactoryClass/]
-
-[template public genFeature(genFeature : GenFeature, genClass : GenClass, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isInterface : Boolean, isImplementation : Boolean, positiveOffsetCorrection : String, negativeOffsetCorrection : String, singleWildcard : String)]
-[if (genModel.arrayAccessors and genFeature.isListType() and not genFeature.isFeatureMapType() and not genFeature.isMapType()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (not isImplementation) ]
-	[genFeature.getListItemType(genClass)/]['[]'/] [genFeature.getGetArrayAccessor()/]();
-
-  [else]
-	public [genFeature.getListItemType(genClass)/]['[]'/] [genFeature.getGetArrayAccessor()/]() {
-    [if (genFeature.isVolatile()) ]
-		[genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/] list = ([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]();
-		if (list.isEmpty()) return [if (genModel.useGenerics() and not genFeature.getListItemType(genClass).contains('<') and genFeature.getListItemType(null) <> genFeature.getListItemType(genClass)) ]([genFeature.getListItemType(genClass)/]['[]'/])[/if][genFeature.getUpperName()/]_EEMPTY_ARRAY;
-    [else]
-		if ([genFeature.getSafeName()/] == null || [genFeature.getSafeName()/].isEmpty()) return [if (genModel.useGenerics() and not genFeature.getListItemType(genClass).contains('<') and genFeature.getListItemType(null) <> genFeature.getListItemType(genClass)) ]([genFeature.getListItemType(genClass)/]['[]'/])[/if][genFeature.getUpperName()/]_EEMPTY_ARRAY;
-		[genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/] list = ([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getSafeName()/];
-    [/if]
-		list.shrink();
-		return ([genFeature.getListItemType(genClass)/]['[]'/])list.data();
-	}
-
-  [/if]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (not isImplementation) ]
-	[genFeature.getListItemType(genClass)/] get[genFeature.getAccessorName()/](int index);
-
-  [else]
-	public [genFeature.getListItemType(genClass)/] get[genFeature.getAccessorName()/](int index) {
-		return [if (not genModel.useGenerics()) ]([genFeature.getListItemType(genClass)/])[/if][genFeature.getGetAccessor()/]().get(index);
-	}
-
-  [/if]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (not isImplementation) ]
-	int get[genFeature.getAccessorName()/]Length();
-
-  [else]
-	public int get[genFeature.getAccessorName()/]Length() {
-    [if (genFeature.isVolatile()) ]
-		return [genFeature.getGetAccessor()/]().size();
-    [else]
-		return [genFeature.getSafeName()/] == null ? 0 : [genFeature.getSafeName()/].size();
-    [/if]
-	}
-
-  [/if]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (not isImplementation) ]
-	void set[genFeature.getAccessorName()/]([genFeature.getListItemType(genClass)/]['[]'/] new[genFeature.getCapName()/]);
-
-  [else]
-	public void set[genFeature.getAccessorName()/]([genFeature.getListItemType(genClass)/]['[]'/] new[genFeature.getCapName()/]) {
-		(([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).setData(new[genFeature.getCapName()/].length, new[genFeature.getCapName()/]);
-	}
-
-  [/if]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (not isImplementation) ]
-	void set[genFeature.getAccessorName()/](int index, [genFeature.getListItemType(genClass)/] element);
-
-  [else]
-	public void set[genFeature.getAccessorName()/](int index, [genFeature.getListItemType(genClass)/] element) {
-		[genFeature.getGetAccessor()/]().set(index, element);
-	}
-
-  [/if]
-[/if]
-[if (genFeature.isGet() and (isImplementation or not genFeature.isSuppressedGetVisibility()))]
-  [if (isInterface)]
-	/**
-	 * Returns the value of the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/].
-    [if (genFeature.isListType())]
-      [if (genFeature.isMapType())]
-        [let keyFeature : GenFeature = genFeature.getMapEntryTypeGenClass().getMapEntryKeyFeature()]
-          [let valueFeature : GenFeature = genFeature.getMapEntryTypeGenClass().getMapEntryValueFeature()]
-	 * The key is of type [if (keyFeature.isListType()) ]list of {@link [keyFeature.getQualifiedListItemType(genClass)/]}[else]{@link [keyFeature.getType(genClass)/]}[/if],
-	 * and the value is of type [if (valueFeature.isListType()) ]list of {@link [valueFeature.getQualifiedListItemType(genClass)/]}[else]{@link [valueFeature.getType(genClass)/]}[/if],
-          [/let]
-        [/let]
-      [else][if (not genFeature.isWrappedFeatureMapType() and not (genModel.suppressEMFMetaData and 'org.eclipse.emf.ecore.EObject' = genFeature.getQualifiedListItemType(genClass)))]
-		[let typeName : String = genFeature.getQualifiedListItemType(genClass)]
-          [let index : Integer = if typeName.index('<') < 0 then typeName.index('[') else typeName.index('<') endif]
-            [let head : String = if index < 0 then typeName else typeName.substring(1, index - 1) endif]
-              [let tail : String = if index < 0 then '' else typeName.substring(index).replaceAll('<', '&lt;') endif]
-	 * The list contents are of type {@link [head/]}[tail/].
-	          [/let]
-	        [/let]
-	      [/let]
-        [/let]
-      [/if][/if]
-    [else][if (genFeature.isSetDefaultValue()) ]
-	 * The default value is <code>[genFeature.getDefaultValue()/]</code>.
-    [/if][/if]
-    [if (genFeature.getTypeGenEnum() <> null) ]
-	 * The literals are from the enumeration {@link [genFeature.getTypeGenEnum().getQualifiedName()/]}.
-    [/if]
-    [if (genFeature.isBidirectional() and not genFeature.getReverse().genClass.isMapEntry())]
-      [let reverseGenFeature : GenFeature = genFeature.getReverse()]
-        [if (not reverseGenFeature.isSuppressedGetVisibility()) ]
-	 * It is bidirectional and its opposite is '{@link [reverseGenFeature.genClass.getQualifiedInterfaceName()/]#[reverseGenFeature.getGetAccessor()/] <em>[reverseGenFeature.getFormattedName()/]</em>}'.
-        [/if]
-      [/let]
-    [/if]
-	 * <!-- begin-user-doc -->
-    [if (not genFeature.hasDocumentation()) ]
-	 * <p>
-	 * If the meaning of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/] isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-    [/if]
-	 * <!-- end-user-doc -->
-    [if (genFeature.hasDocumentation()) ]
-	 * <!-- begin-model-doc -->
-	 * [genFeature.getDocumentation(genModel.getIndentation())/]
-	 * <!-- end-model-doc -->
-    [/if]
-	 * @return the value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/].
-    [if (genFeature.getTypeGenEnum() <> null) ]
-	 * @see [genFeature.getTypeGenEnum().getQualifiedName()/]
-    [/if]
-    [if (genFeature.isUnsettable()) ]
-      [if (not genFeature.isSuppressedIsSetVisibility()) ]
-	 * @see #isSet[genFeature.getAccessorName()/]()
-      [/if]
-      [if (genFeature.isChangeable() and not genFeature.isSuppressedUnsetVisibility()) ]
-	 * @see #unset[genFeature.getAccessorName()/]()
-      [/if]
-    [/if]
-    [if (genFeature.isChangeable() and not genFeature.isListType() and not genFeature.isSuppressedSetVisibility()) ]
-	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
-    [/if]
-    [if (not genModel.suppressEMFMetaData) ]
-	 * @see [genPackage.getQualifiedPackageInterfaceName()/]#get[genFeature.getFeatureAccessorName()/]()
-    [/if]
-    [if (genFeature.isBidirectional() and not genFeature.getReverse().genClass.isMapEntry())]
-      [let reverseGenFeature : GenFeature = genFeature.getReverse()]
-        [if (not reverseGenFeature.isSuppressedGetVisibility()) ]
-	 * @see [reverseGenFeature.genClass.getQualifiedInterfaceName()/]#[reverseGenFeature.getGetAccessor()/]
-        [/if]
-      [/let]
-    [/if]
-    [if (not genModel.suppressEMFModelTags)]
-      [let modelInfoLines : Sequence(String) = genFeature.getModelInfo().tokenize(genModel.getLineDelimiter())]
-        [if (modelInfoLines->isEmpty())]
-	 * @model
-        [else]
-	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
-        [/if]
-      [/let]
-    [/if]
-	 * @generated
-	 */
-  [else][comment isInterface/]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [if (isJDK50)][comment] { //Class/getGenFeature.annotations.insert.javajetinc[/comment]
-    [/if]
-  [/if][comment isInterface/]
-  [if (not isImplementation) ]
-	[genFeature.getImportedType(genClass)/] [genFeature.getGetAccessor()/]();
-
-  [else]
-    [if (genModel.useGenerics() and ((genFeature.isContainer() or genFeature.isResolveProxies()) and not genFeature.isListType() and not (genModel.reflectiveDelegation and genModel.isDynamicDelegation()) and genFeature.isUncheckedCast(genClass) or genFeature.isListType() and not genFeature.isFeatureMapType() and (genModel.reflectiveDelegation or genModel.isVirtualDelegation() or genModel.isDynamicDelegation()) or genFeature.isListDataType() and genFeature.hasDelegateFeature() or genFeature.isListType() and genFeature.hasSettingDelegate())) ]
-	@SuppressWarnings("unchecked")
-    [/if]
-	public [genFeature.getImportedType(genClass)/] [genFeature.getGetAccessor()/][if (genClass.hasCollidingGetAccessorOperation(genFeature)) ]_[/if]() {
-		[genGetContent(genFeature,genModel,genPackage,isImplementation)/]
-		
-	}
-
-  [/if]
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicGet()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (isJDK50)][comment] { //Class/basicGetGenFeature.annotations.insert.javajetinc[/comment]
-  [/if]
-	public [genFeature.getImportedType(genClass)/] basicGet[genFeature.getAccessorName()/]() {
-		[genGetContent(genFeature,genModel,genPackage,isImplementation)/]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicSet()) ]
-
-	[genBasicSetContent(genFeature, genModel, genPackage, isImplementation, isJDK50, negativeOffsetCorrection, positiveOffsetCorrection)/]
-
-[/if]
-[if (genFeature.isSet() and (isImplementation or not genFeature.isSuppressedSetVisibility())) ]
-  [if (isInterface) ]
-	/**
-	 * Sets the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/].
-    [if (genFeature.isEnumType()) ]
-	 * @see [genFeature.getTypeGenEnum().getQualifiedName()/]
-    [/if]
-    [if (genFeature.isUnsettable()) ]
-      [if (not genFeature.isSuppressedIsSetVisibility()) ]
-	 * @see #isSet[genFeature.getAccessorName()/]()
-      [/if]
-      [if (not genFeature.isSuppressedUnsetVisibility()) ]
-	 * @see #unset[genFeature.getAccessorName()/]()
-      [/if]
-    [/if]
-	 * @see #[genFeature.getGetAccessor()/]()
-	 * @generated
-	 */
-  [else][comment isInterface /]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [if (isJDK50)][comment] { //Class/setGenFeature.annotations.insert.javajetinc[/comment]
-    [/if]
-  [/if][comment isInterface /]
-  [if (not isImplementation)]
-	void set[genFeature.getAccessorName()/]([genFeature.getImportedType(genClass)/] value);
-
-  [else][comment not isImplementation /]
-    [comment Using query instead of variable because let does not support null !!!
-        let setAccessorOperation : GenOperation = genClass.getSetAccessorOperation(genFeature)/]
-	
-	[genSetContent(genFeature, genModel, genPackage , isImplementation, isJDK50,negativeOffsetCorrection,positiveOffsetCorrection)/]
-
-  [/if][comment not isImplementation /]
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicUnset()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (isJDK50)][comment] { //Class/basicUnsetGenFeature.annotations.insert.javajetinc[/comment]
-  [/if]
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] basicUnset[genFeature.getAccessorName()/]([genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-  [if (genModel.isDynamicDelegation()) ]
-		return eDynamicInverseRemove(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[if (genFeature.isResolveProxies()) ]basicGet[genFeature.getAccessorName()/][else][genFeature.getGetAccessor()/][/if](), [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
-  [else][if (not genFeature.isVolatile()) ]
-    [if (genModel.isVirtualDelegation()) ]
-      [if (not genModel.suppressNotification) ]Object old[genFeature.getCapName()/] = [/if]eVirtualUnset([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-    [else]
-      [if (not genModel.suppressNotification) ]
-		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
-      [/if]
-		[genFeature.getSafeName()/] = null;
-    [/if]
-    [if (genModel.isVirtualDelegation()) ]
-      [if (not genModel.suppressNotification) ]
-		boolean isSetChange = old[genFeature.getCapName()/] != EVIRTUAL_NO_VALUE;
-      [/if]
-    [else][if (genClass.isESetFlag(genFeature)) ]
-      [if (not genModel.suppressNotification) ]
-		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-      [/if]
-		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
-    [else]
-      [if (not genModel.suppressNotification) ]
-		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
-      [/if]
-		[genFeature.getUncapName()/]ESet = false;
-    [/if][/if]
-    [if (not genModel.suppressNotification) ]
-		if (eNotificationRequired()) {
-			[genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation()) ]isSetChange ? old[genFeature.getCapName()/] : null[else]old[genFeature.getCapName()/][/if], null, [if (genModel.isVirtualDelegation()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-    [/if]
-  [else]
-		// TODO: implement this method to unset the contained '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-  [/if][/if]
-	}
-
-[/if]
-[if (genFeature.isUnset() and (isImplementation or not genFeature.isSuppressedUnsetVisibility())) ]
-  [if (isInterface) ]
-	/**
-	 * Unsets the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-    [if (not genFeature.isSuppressedIsSetVisibility()) ]
-	 * @see #isSet[genFeature.getAccessorName()/]()
-    [/if]
-	 * @see #[genFeature.getGetAccessor()/]()
-    [if (not genFeature.isListType() and not genFeature.isSuppressedSetVisibility()) ]
-	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
-    [/if]
-	 * @generated
-	 */
-  [else][comment isInterface/]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [if (isJDK50)][comment] { //Class/unsetGenFeature.annotations.insert.javajetinc[/comment]
-    [/if]
-  [/if][comment isInterface/]
-  [if (not isImplementation) ]
-	void unset[genFeature.getAccessorName()/]();
-
-  [else][comment not isImplementation/]
-	[genUnsetContent(genFeature,genModel,genPackage,isJDK50,negativeOffsetCorrection,positiveOffsetCorrection, singleWildcard)/]
-  [/if][comment not isImplementation/]
-[/if]
-[if (genFeature.isIsSet() and (isImplementation or not genFeature.isSuppressedIsSetVisibility())) ]
-  [if (isInterface) ]
-	/**
-	 * Returns whether the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/] is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/] is set.
-    [if (genFeature.isChangeable() and not genFeature.isSuppressedUnsetVisibility()) ]
-	 * @see #unset[genFeature.getAccessorName()/]()
-    [/if]
-	 * @see #[genFeature.getGetAccessor()/]()
-    [if (not genFeature.isListType() and genFeature.isChangeable() and not genFeature.isSuppressedSetVisibility()) ]
-	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
-    [/if]
-	 * @generated
-	 */
-  [else][comment isInterface/]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [comment][if (isJDK50)][comment] { //Class/isSetGenFeature.annotations.insert.javajetinc[/comment]
-    [/if][/comment]
-  [/if][comment isInterface/]
-  [if (not isImplementation) ]
-	boolean isSet[genFeature.getAccessorName()/]();
-
-  [else][comment not isImplementation/]
-	[genIsSetContent(genFeature , genModel, genPackage ,isJDK50,negativeOffsetCorrection,positiveOffsetCorrection, singleWildcard )/]
-
-  [/if][comment not isImplementation/]
-[/if]
-[/template]
-
-[template public genGetContentPrimitiveType(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage)]
-	[if (genFeature.isStereotypeProperty())]
-		[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
-	
-		if(stereotype != null) {
-			Object umlElement = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getValue(stereotype, "[genFeature.getSafeName()/]");
-	
-				[if (genFeature.isDerived())]
-					[genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])umlElement;
-					return [genFeature.getSafeName()/];
-				[else]
-					return ([genFeature.getImportedType(genClass)/])umlElement;
-				[/if]
-		}
-	
-		throw new UnsupportedOperationException();
-	[else]
-		[if (genFeature.isField())]
-			[genFeature.getSafeName()/] =  (([genModel.getImportedName(genFeature.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
-			return [genFeature.getSafeName()/];
-		[else]
-			return  (([genModel.getImportedName(genFeature.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
-		[/if]
-	[/if]
-[/template]
-
-[template public genGetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean)]
-	[if (genFeature.isListType())]
-		[if (genFeature.isPrimtiveList())]
-			 [genFeature.genGetContentPrimitiveType(genModel, genPackage)/]
-		[else]
-			[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/]> umlList = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
-			[genFeature.getImportedType(genClass)/] update = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genFeature.getTypeGenClass().getQualifiedInterfaceName()/]>();
-			[if (genFeature.isField())]
-				if([genFeature.getSafeName()/] == null) {
-					[comment][genFeature.getSafeName()/] = new [genClass.getListConstructor(genFeature)/];[/comment]
-					[genFeature.getSafeName()/] = new [genClass.getWrappingListConstructor(genFeature,genFeature.getTypeGenClass().getQualifiedInterfaceName())/];
-				}
-			[else]
-				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = new [genClass.getWrappingListConstructor(genFeature,genFeature.getTypeGenClass().getQualifiedInterfaceName())/];[comment]org.eclipse.papyrus.facade.utils.wrappinglist.WrappingBasicEList(umlList);[/comment]
-			[/if]
-	
-			for([genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/] umlElement : umlList) {
-	
-				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
-				if(representingElement != null) {
-					if(representingElement instanceof [genFeature.getTypeGenClass().getQualifiedInterfaceName()/]) {
-						update.add(([genFeature.getTypeGenClass().getQualifiedInterfaceName()/])representingElement);
-					} 	
-				}			
-			}
-	
-			[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().updateCache(update, [genFeature.getSafeName()/]);
-			return [genFeature.getSafeName()/];
-		[/if]
-
-	[else]
-		[if (genFeature.isPrimitiveType() or genFeature.isStringType())]
- 			[genFeature.genGetContentPrimitiveType(genModel, genPackage)/]
-		[else]
-			[if (genFeature.isStereotypeProperty())]
-				[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
-
-				if(stereotype != null) {
-					Object umlElement = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getValue(stereotype, "[genFeature.getSafeName()/]");
-			[else]
-				[if (genFeature.isExtentionStereotypeProperty())]
-					[genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/] umlElement = [genModel.getImportedName('org.eclipse.uml2.uml.util.UMLUtil')/].getStereotypeApplication(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented(), [genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/].class);
-				[else]
-					[genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/] umlElement = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
-				[/if]
-				
-			[/if]
-
-			if(umlElement [if (genFeature.isEnumType())] !=null [else] instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] [/if]) {
-			
-
-				[if (genFeature.isEnumType())]
-					Enum representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromUML((Enum)umlElement);
-				[else]
-					[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement =  [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
-				[/if]
-				
-				if(representingElement != null) {
-					if(representingElement instanceof [genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/]) {
-						[if (not genClass.isField(genFeature)) ]
-							return ([genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
-						[else]
-							[genFeature.getSafeName()/] = ([genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
-
-							return [genFeature.getSafeName()/];
-						[/if]
-					}
-				}
-			} 
-			[if (genFeature.isStereotypeProperty())]
-				}
-			[/if]
-			
-			return null;
-		[/if]
-	[/if]
-[/template]
-
-[template public genSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean, isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String)]
-	public void set[genFeature.getAccessorName()/][if (genClass.hasCollidingSetAccessorOperation(genFeature)) ]_[/if]([genFeature.getImportedType(genClass)/] [if (genClass.getSetAccessorOperation(genFeature) = null)]new[genFeature.getCapName()/][else][genClass.getSetAccessorOperation(genFeature).genParameters->at(1).getName()/][/if]) {
-	[if (not genFeature.isVolatile()) ]
-      [if (genFeature.isContainer())]
-        [let reverseFeature : GenFeature = genFeature.getReverse()]
-          [let targetClass : GenClass = reverseFeature.genClass]
-            [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
-		if (new[genFeature.getCapName()/] != eInternalContainer() || (eContainerFeatureID() != [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/] && new[genFeature.getCapName()/] != null)) {
-			if ([genModel.getImportedName('org.eclipse.emf.ecore.util.EcoreUtil')/].isAncestor(this, [genFeature.getEObjectCast()/]new[genFeature.getCapName()/]))
-				throw new [genModel.getImportedName('java.lang.IllegalArgumentException')/]("Recursive containment not allowed for " + toString());[genModel.getNonNLS()/]
-			if (eInternalContainer() != null)
-				eBasicRemoveFromContainer(null);
-			if (new[genFeature.getCapName()/] != null)
-				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
-			basicSet[genFeature.getAccessorName()/]([genFeature.getInternalTypeCast()/]new[genFeature.getCapName()/], null);
-			
-		}
-            [/let]
-          [/let]
-        [/let]
-      [else][if (genFeature.isBidirectional() or genFeature.isEffectiveContains()) ]
-        [if (genModel.isVirtualDelegation()) ]
-		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [/if]
-		if (new[genFeature.getCapName()/] != [genFeature.getSafeName()/]) {
-			if ([genFeature.getSafeName()/] != null)
-        [if (not genFeature.isBidirectional()) ]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, null);
-			if (new[genFeature.getCapName()/] != null)
-				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, null);
-        [else]
-          [let reverseFeature : GenFeature = genFeature.getReverse()]
-            [let targetClass : GenClass = reverseFeature.genClass]
-              [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
-			if (new[genFeature.getCapName()/] != null)
-				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
-              [/let]
-            [/let]
-          [/let]
-        [/if]
-			basicSet[genFeature.getAccessorName()/]([genFeature.getInternalTypeCast()/]new[genFeature.getCapName()/], null);
-		}[if (genFeature.isUnsettable())] else {
-          [if (genModel.isVirtualDelegation()) ]
-			boolean old[genFeature.getCapName()/]ESet = eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-          [else][if (genClass.isESetFlag(genFeature)) ]
-            [if (not genModel.suppressNotification) ]
-			boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-            [/if]
-			[genClass.getESetFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_ESETFLAG;
-          [else]
-            [if (not genModel.suppressNotification) ]
-			boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
-            [/if]
-			[genFeature.getUncapName()/]ESet = true;
-          [/if][/if]
-          [if (not genModel.suppressNotification) ]
-			if (eNotificationRequired())
-				eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].SET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], new[genFeature.getCapName()/], new[genFeature.getCapName()/], not old[genFeature.getCapName()/]ESet));
-          [/if]
-		}
-
-        [/if]
-      [else]
-
-
-
-		[if (genFeature.isAPrimitiveType() or genFeature.isStringType() ) ]
-			[if (genFeature.isStereotypeProperty())]
-				[stereotypeSetContent(genModel,genFeature)/]
-			[else]
-				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](new[genFeature.getCapName()/]);
-			[/if]
-		[else]
-			[if (genFeature.isEnumType())]
-				[if (genFeature.isStereotypeProperty())]
-					[stereotypeSetContent(genModel,genFeature)/]
-				[else]	
-					(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/])[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromSpecific(new[genFeature.getCapName()/]));
-				[/if]
-			[else]
-				[if (genFeature.isStereotypeProperty())]
-					[stereotypeSetContent(genModel,genFeature)/]
-				[else]	
-					(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/])new[genFeature.getCapName()/].get__Represented());
-				[/if]
-			[/if]
-		[/if]
-      [/if][/if]
-    [else]
-		throw new UnsupportedOperationException();
-	[/if]
-	}
-[/template]
-
-[template public stereotypeSetContent(genModel:GenModel,genFeature:GenFeature)]
-	[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
-			
-	if(stereotype != null) {
-		(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", new[genFeature.getCapName()/]);
-	}
-[/template]
-
-[template public genBasicSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean, isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String)]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (isJDK50)][comment] { //Class/basicSetGenFeature.annotations.insert.javajetinc[/comment]
-  [/if]
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] basicSet[genFeature.getAccessorName()/]([genFeature.getImportedInternalType(genClass)/] new[genFeature.getCapName()/], [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-  [if (genFeature.isContainer()) ]
-		msgs = eBasicSetContainer(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/], [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
-		return msgs;
-  [else][if (genModel.isDynamicDelegation()) ]
-		msgs = eDynamicInverseAdd(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/], [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
-		return msgs;
-  [else][if (not genFeature.isVolatile()) ]
-    [if (genModel.isVirtualDelegation()) ]
-		Object old[genFeature.getCapName()/] = eVirtualSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], new[genFeature.getCapName()/]);
-    [else]
-		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
-		[genFeature.getSafeName()/] = new[genFeature.getCapName()/];
-    [/if]
-    [if (genFeature.isUnsettable()) ]
-      [if (genModel.isVirtualDelegation()) ]
-        [if (not genModel.suppressNotification) ]
-		boolean isSetChange = old[genFeature.getCapName()/] == EVIRTUAL_NO_VALUE;
-        [/if]
-      [else][if (genClass.isESetFlag(genFeature)) ]
-		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-        [if (not genModel.suppressNotification) ]
-		[genClass.getESetFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_ESETFLAG;
-        [/if]
-      [else]
-        [if (not genModel.suppressNotification) ]
-		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
-        [/if]
-		[genFeature.getUncapName()/]ESet = true;
-      [/if][/if]
-    [/if]
-
-	[if (genFeature.isStereotypeProperty())]
-		[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
-
-		if(stereotype != null) {
-			if(new[genFeature.getCapName()/] == null) {
-				(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", null);
-			} else {
-				(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", new[genFeature.getCapName()/].get__Represented());
-			}
-		}
-	[else]
-		[if (genFeature.isExtentionStereotypeProperty())]
-			if(new[genFeature.getCapName()/] == null) {
-				String['[]'/] stereotypesQualifiedNames = { [genFeature.getTypeGenClassifier().getEcoreClassifier().getAllStereotypeQualifiedNames(genModel)/] };
-	
-				for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
-				if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) != null) {
-						[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
-						if(stereotype != null) {
-							(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).unapplyStereotype(stereotype);
-						} else {
-							System.err.println("Problem: cannot unapply stereotype " + stereoQualifiedName);
-						}
-					}
-				}
-				[genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].REMOVE, [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[genFeature.getFeatureAccessorName()/](), old[genFeature.getCapName()/], new[genFeature.getCapName()/], -1, old[genFeature.getCapName()/] != null);
-				this.eNotify(notification);
-			} else {
-				String['[]'/] stereotypesQualifiedNames = { [genFeature.getTypeGenClassifier().getEcoreClassifier().getAllStereotypeQualifiedNames(genModel)/] };
-	
-				for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
-					if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) == null) {
-						[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
-						if(stereotype != null) {
-							(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).applyStereotype(stereotype);
-						} else {
-							System.err.println("Problem: cannot apply stereotype " + stereoQualifiedName);
-						}
-					}
-				}
-				[genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].ADD, [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[genFeature.getFeatureAccessorName()/](), old[genFeature.getCapName()/], new[genFeature.getCapName()/], -1, old[genFeature.getCapName()/] != null);
-				this.eNotify(notification);
-			}
-		[else]
-			if(new[genFeature.getCapName()/] == null) {
-				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](null);
-			} else {
-				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/])new[genFeature.getCapName()/].get__Represented());
-			}
-		[/if]		
-	[/if]
-
-
-
-		return null;
-  [else][if (genFeature.hasDelegateFeature())]
-    [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
-      [if (delegateFeature.isWrappedFeatureMapType()) ]
-		return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).basicAdd([genFeature.getQualifiedFeatureAccessor()/], new[genFeature.getCapName()/], msgs);
-      [else]
-		return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).basicAdd([genFeature.getQualifiedFeatureAccessor()/], new[genFeature.getCapName()/], msgs);
-      [/if]
-    [/let]
-  [else]
-		// TODO: implement this method to set the contained '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
-		// -> this method is automatically invoked to keep the containment relationship in synch
-		// -> do not modify other features
-		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-  [/if][/if][/if][/if]
-	}
-[/template]
-
-[template public genUnsetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage,isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String, singleWildcard : String)]
-	public void unset[genFeature.getAccessorName()/][if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) ]_[/if]() {
-
-	(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).unset[genFeature.ecoreFeature.findUMLAccessorName(genModel)/]();
-
-    [comment][if (genModel.isDynamicDelegation()) ]
-		eDynamicUnset([genClass.getQualifiedFeatureID(genFeature)/], [genFeature.getQualifiedFeatureAccessor()/]);
-    [else][if (genModel.reflectiveDelegation) ]
-		eUnset([genFeature.getQualifiedFeatureAccessor()/]);
-    [else][if (genFeature.hasSettingDelegate()) ]
-		[genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicUnset(this, null, 0);
-    [else][if (not genFeature.isVolatile()) ]
-      [if (genFeature.isListType()) ]
-        [if (genModel.isVirtualDelegation()) ]
-		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [/if]
-		if ([genFeature.getSafeName()/] != null) (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/].Unsettable[singleWildcard/])[genFeature.getSafeName()/]).unset();
-      [else][if (genFeature.isBidirectional() or genFeature.isEffectiveContains()) ]
-        [if (genModel.isVirtualDelegation()) ]
-		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [/if]
-		if ([genFeature.getSafeName()/] != null) {
-			[genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs = null;
-        [if (not genFeature.isBidirectional()) ]
-			msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, msgs);
-        [else]
-          [let reverseFeature : GenFeature = genFeature.getReverse()]
-            [let targetClass : GenClass = reverseFeature.genClass]
-              [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
-			msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
-              [/let]
-            [/let]
-          [/let]
-        [/if]
-			msgs = basicUnset[genFeature.getAccessorName()/](msgs);
-			if (msgs != null) msgs.dispatch();
-		} else {
-        [if (genModel.isVirtualDelegation()) ]
-			boolean old[genFeature.getCapName()/]ESet = eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [else][if (genClass.isESetFlag(genFeature)) ]
-          [if (not genModel.suppressNotification) ]
-			boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-          [/if]
-			[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
-        [else]
-          [if (not genModel.suppressNotification) ]
-			boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
-          [/if]
-			[genFeature.getUncapName()/]ESet = false;
-        [/if][/if]
-        [if (not genModel.suppressNotification) ]
-			if (eNotificationRequired())
-				eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], null, null, old[genFeature.getCapName()/]ESet));
-        [/if]
-		}
-      [else]
-        [if (genClass.isFlag(genFeature)) ]
-          [if (not genModel.suppressNotification) ]
-            [if (genFeature.isBooleanType()) ]
-		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = ([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0;
-            [else]
-		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET];
-            [/if]
-          [/if]
-        [else][if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
-		Object old[genFeature.getCapName()/] = eVirtualUnset([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [else]
-          [if (not genModel.suppressNotification) ]
-		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
-          [/if]
-        [/if][/if]
-       [if (not genModel.suppressNotification) ]
-        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
-		boolean isSetChange = old[genFeature.getCapName()/] != EVIRTUAL_NO_VALUE;
-          [else][if (genClass.isESetFlag(genFeature)) ]
-		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-          [else]
-		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
-          [/if][/if]
-        [/if]
-        [if (genFeature.isReferenceType()) ]
-		[genFeature.getSafeName()/] = null;
-          [if (not genModel.isVirtualDelegation()) ]
-            [if (genClass.isESetFlag(genFeature)) ]
-		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
-            [else]
-		[genFeature.getUncapName()/]ESet = false;
-            [/if]
-          [/if]
-          [if (not genModel.suppressNotification) ]
-		if (eNotificationRequired())
-			eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation()) ]isSetChange ? old[genFeature.getCapName()/] : null[else]old[genFeature.getCapName()/][/if], null, [if (genModel.isVirtualDelegation()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]));
-          [/if]
-        [else]
-          [if (genClass.isFlag(genFeature)) ]
-            [if (genFeature.isBooleanType()) ]
-		if ([genFeature.getEDefault()/]) [genClass.getFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_EFLAG; else [genClass.getFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_EFLAG;
-            [else]
-		[genClass.getFlagsField(genFeature)/] = [genClass.getFlagsField(genFeature)/] & ~[genFeature.getUpperName()/]_EFLAG | [genFeature.getUpperName()/]_EFLAG_DEFAULT;
-            [/if]
-          [else][if (not genModel.isVirtualDelegation() or genFeature.isPrimitiveType()) ]
-		[genFeature.getSafeName()/] = [genFeature.getEDefault()/];
-          [/if][/if]
-          [if (not genModel.isVirtualDelegation() or genFeature.isPrimitiveType()) ]
-            [if (genClass.isESetFlag(genFeature)) ]
-		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
-            [else]
-		[genFeature.getUncapName()/]ESet = false;
-            [/if]
-          [/if]
-          [if (not genModel.suppressNotification) ]
-		if (eNotificationRequired())
-			eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]isSetChange ? old[genFeature.getCapName()/] : [genFeature.getEDefault()/][else]old[genFeature.getCapName()/][/if], [genFeature.getEDefault()/], [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]));
-          [/if]
-        [/if]
-      [/if][/if]
-    [else]][if (genFeature.hasDelegateFeature())]
-      [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
-        [if (delegateFeature.isWrappedFeatureMapType()) ]
-		(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).clear([genFeature.getQualifiedFeatureAccessor()/]);
-        [else]
-		(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).clear([genFeature.getQualifiedFeatureAccessor()/]);
-        [/if]
-      [/let]
-    [else][if (genClass.getUnsetAccessorOperation(genFeature) <> null) ]
-		[genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation())/]
-    [else]
-		// TODO: implement this method to unset the '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-    [/if][/if][/if][/if][/if][/if][/comment]
-	}
-
-[/template]
-
-[template public genIsSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage,isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String, singleWildcard : String)]
-	public boolean isSet[genFeature.getAccessorName()/][if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) ]_[/if]() {
-
-		return (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).isSet[genFeature.ecoreFeature.findUMLAccessorName(genModel)/]();
-
-    [comment][if (genModel.isDynamicDelegation()) ]
-		return eDynamicIsSet([genClass.getQualifiedFeatureID(genFeature)/], [genFeature.getQualifiedFeatureAccessor()/]);
-    [else][if (genModel.reflectiveDelegation) ]
-		return eIsSet([genFeature.getQualifiedFeatureAccessor()/]);
-    [else][if (genFeature.hasSettingDelegate()) ]
-		return [genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
-    [else][if (not genFeature.isVolatile()) ]
-      [if (genFeature.isListType()) ]
-        [if (genModel.isVirtualDelegation()) ]
-		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [/if]
-		return [genFeature.getSafeName()/] != null && (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/].Unsettable[singleWildcard/])[genFeature.getSafeName()/]).isSet();
-      [else]
-        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
-		return eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-        [else][if (genClass.isESetFlag(genFeature)) ]
-		return ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
-        [else]
-		return [genFeature.getUncapName()/]ESet;
-        [/if][/if]
-      [/if]
-    [else][if (genFeature.hasDelegateFeature())]
-      [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
-        [if (delegateFeature.isWrappedFeatureMapType()) ]
-		return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).isEmpty([genFeature.getQualifiedFeatureAccessor()/]);
-        [else]
-		return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).isEmpty([genFeature.getQualifiedFeatureAccessor()/]);
-        [/if]
-      [/let]
-    [else][if (genClass.getIsSetAccessorOperation(genFeature) <> null) ]
-		[genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation())/]
-    [else]
-		// TODO: implement this method to return whether the '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/] is set
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-    [/if][/if][/if][/if][/if][/if][/comment]
-	}
-[/template]
-
-[query public isAPrimitiveType(genFeature : GenFeature) : Boolean= 
- if(genFeature.ecoreFeature.eType.instanceTypeName='java.lang.String' or genFeature.ecoreFeature.eType.instanceTypeName='int' or genFeature.ecoreFeature.eType.instanceTypeName='boolean' or genFeature.ecoreFeature.eType.instanceTypeName='double') then true else false endif/]
-
-[query public toUpperCase( string : String) : String 
-	= invoke('java.lang.String', 'toUpperCase()', Sequence{string}) /]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl
deleted file mode 100644
index 54e85fb0106..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl
+++ /dev/null
@@ -1,191 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module genOperation('http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
-[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
-[import org::eclipse::papyrus::facade::codegen::utils::WrappingListUtils /]
-
-[template public genOperation(genOperation : GenOperation, genClass : GenClass, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isInterface : Boolean, isImplementation : Boolean, isGWT : Boolean)]
-[if (isImplementation) ]
-  [if (genOperation.isInvariant() and genOperation.hasInvariantExpression()) ]
-	/**
-	 * The cached validation expression for the '{@link #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' invariant operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
-	 * @generated
-	 * @ordered
-	 */
-	protected static final [genModel.getImportedName('java.lang.String')/] [genClass.getUniqueNameUpperCase(genOperation)/]__EEXPRESSION = "[genOperation.getInvariantExpression('\t\t')/]";[genModel.getNonNLS()/]
-
-  [else][if (genOperation.hasInvocationDelegate()) ]
-	/**
-	 * The cached invocation delegate for the '{@link #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
-	 * @generated
-	 * @ordered
-	 */
-	protected static final [genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/].Internal.InvocationDelegate [genClass.getUniqueNameUpperCase(genOperation)/]__EINVOCATION_DELEGATE = (([genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/].Internal)[genOperation.getQualifiedOperationAccessor()/]).getInvocationDelegate();
-
-  [/if][/if]
-[/if]
-[if (isInterface) ]
-[comment]<%@ include file="Class/genOperation.javadoc.override.javajetinc" fail="alternative" %>[/comment]
-[comment]<%@ start %>[/comment]
-	/**
-[comment]<%@ include file="Class/genOperation.javadoc.insert.javajetinc" fail="silent" %>[/comment]
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-  [if (genOperation.hasDocumentation() or genOperation.hasParameterDocumentation()) ]
-	 * <!-- begin-model-doc -->
-    [if (genOperation.hasDocumentation()) ]
-	 * [genOperation.getDocumentation(genModel.getIndentation())/]
-    [/if]
-  [for (genParameter : GenParameter | genOperation.genParameters)]
-      [if (genParameter.hasDocumentation())]
-        [let documentation : String = genParameter.getDocumentation('')]
-          [if (documentation.contains('\n') or documentation.contains('\r')) ]
-	 * @param [genParameter.getName()/]
-	 *   [genParameter.getDocumentation(genModel.getIndentation())/]
-          [else]
-	 * @param [genParameter.getName()/] [genParameter.getDocumentation(genModel.getIndentation())/]
-          [/if]
-        [/let]
-      [/if]
-    [/for]
-	 * <!-- end-model-doc -->
-  [/if]
-  [if (not genModel.suppressEMFModelTags)]
-    [let modelInfoLines : Sequence(String) = genOperation.getModelInfo().tokenize(genModel.getLineDelimiter())]
-      [if (modelInfoLines->isEmpty())]
-	 * @model
-      [else]
-	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
-      [/if]
-    [/let]
-  [/if]
-	 * @generated
-	 */
-[comment]<%@ end %><%//Class/genOperation.javadoc.override.javajetinc%>[/comment]
-[else]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (isJDK50)][comment]//Class/genOperation.annotations.insert.javajetinc[/comment]
-[comment]<%@ include file="Class/genOperation.annotations.insert.javajetinc" fail="silent" %>[/comment]
-  [/if]
-[/if]
-[if (not isImplementation) ]
-	[genOperation.getTypeParameters(genClass)/][genOperation.getImportedType(genClass)/] [genOperation.getName()/]([genOperation.getParameters(genClass)/])[genOperation.getThrows(genClass)/];
-
-[else]
-	public [genOperation.getTypeParameters(genClass)/][genOperation.getImportedType(genClass)/] [genOperation.getName()/]([genOperation.getParameters(genClass)/])[genOperation.getThrows(genClass)/] {
-  [if (genOperation.hasBody()) ]
-		[genOperation.getBody(genModel.getIndentation())/]
-  [else]
-	[if (genOperation.isListType())]
-		[if (genOperation.isPrimtiveList())]
-			 [genOperation.genGetContentPrimitiveType(genModel, genPackage)/]
-		[else]
-			[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<? extends [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]> umlList = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
-			[genOperation.getImportedType(genClass)/] update = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genOperation.getTypeGenClass().getQualifiedInterfaceName()/]>();
-	
-			for([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement : umlList) {
-	
-				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
-				if(representingElement != null) {
-					if(representingElement instanceof [genOperation.getTypeGenClass().getQualifiedInterfaceName()/]) {
-						update.add(([genOperation.getTypeGenClass().getQualifiedInterfaceName()/])representingElement);
-					} 	
-				}			
-			}
-
-			return update;
-		[/if]
-
-	[else]	
-		[if (genOperation.isPrimitive())]
- 			[genOperation.genGetContentPrimitiveType(genModel, genPackage)/]
-		[else]
-			[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
-	
-			if(umlElement [if (genOperation.isEnumType())] !=null [else] instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] [/if]) {
-			
-	
-				[if (genOperation.isEnumType())]
-					Enum representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromUML((Enum)umlElement);
-				[else]
-					[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement =  [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
-				[/if]
-				
-				if(representingElement != null) {
-					if(representingElement instanceof [genOperation.getTypeGenClassifier().getAppropriateQualifiedTypeName()/]) {
-				
-							return ([genOperation.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
-	
-					}
-				}
-			} 
-	
-			return null;
-		[/if]	
-	[/if]
-
-  [/if]
-	}
-
-[/if]
-[comment]<%@ include file="Class/genOperation.insert.javajetinc" fail="silent" %>[/comment]
-[comment]<%@ end %><%//Class/implementedGenOperation.override.javajetinc%>[/comment]
-[/template]
-
-[template public genParameters(genOperation : GenOperation)]
-	[for (param : GenParameter | genOperation.genParameters) separator (',')]
-		[if (param.isPrimitive() or genOperation.isInvariant() or param.isPrimtiveList())]
-			[param.getName()/]
-		[else]
-			[if (param.isListType())]
-				[param.getGenModel().getImportedName(param.getGenPackage().getUtilitiesPackageName()+'.Wrapper')/].getInstance().toRepresentedList([param.getName()/])
-			[else]
-				[if (param.isEnumType())]
-					(([param.getGenModel().getImportedName(param.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(param.getGenModel()).getPackagePathFromUML()+'.'+param.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(param.getGenModel()))/])[param.getGenModel().getImportedName(param.getGenPackage().getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromSpecific([param.getName()/]))
-				[else]
-					([param.getGenModel().getImportedName(param.getTypeGenClass().ecoreClass.findUMLMetaElement(param.getGenModel()).getPackagePathFromUML()+'.'+param.getTypeGenClass().ecoreClass.getUMLMetaElement(param.getGenModel()))/])[param.getName()/].get__Represented()
-				[/if]
-			[/if]
-		[/if]
-		
-	[/for]
-[/template]
-
-[template public genGetContentPrimitiveType(genOperation : GenOperation, genModel: GenModel, genPackage : GenPackage)]
-
-	[if (genOperation.isVoid())]
-		(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
-	[else]
-		return  (([genModel.getImportedName(genOperation.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
-	[/if]
-	
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl
deleted file mode 100644
index 27bebd978a0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl
+++ /dev/null
@@ -1,39 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module reflectiveDelegationAlternative('http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-
-
-[template public reflectiveDelegationAlternative(genClass : GenClass, isImplementation : Boolean, genModel : GenModel)]
-[if (isImplementation
-	and (genModel.featureDelegation = GenDelegationKind::Reflective
-		or genModel.isDynamicDelegation())
-	and (genClass.getClassExtendsGenClass() = null
-		or (genClass.getClassExtendsGenClass().getGenModel().featureDelegation <> GenDelegationKind::Reflective
-			and not genClass.getClassExtendsGenClass().getGenModel().isDynamicDelegation()))) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	protected int eStaticFeatureCount()
-	{
-		return [if genClass.getClassExtendsGenClass() = null]0[else][genClass.getClassExtendsGenClass().getAllGenFeatures()->size()/][/if];
-	}
-
-[/if]
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl
deleted file mode 100644
index ea9464612df..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl
+++ /dev/null
@@ -1,69 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module AbstractRepresentingClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-
-
-[template public abstractRepresentingClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'AbstractRepresentingElement'} ]
-[genModel.initializeImportManager(packageName, className)/]
-
-[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
-
-[file (genPackage.abstractRepresentingClassPath(className), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage. abstractRepresentingFileContent(genModel, className)]
-[genModel.genSortedImports()/]
-[content/]
-[/let]
-[/file]
-[/template]
-
-[template protected  abstractRepresentingFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.papyrus.facade.utils.RepresentingElement;
-
-
-public abstract class AbstractRepresentingElement extends MinimalEObjectImpl.Container implements RepresentingElement {
-
-
-	protected EObject __representedElement;
-
-	@Override
-	public EObject get__Represented() {
-		return __representedElement;
-	}
-
-	@Override
-	public void set__Represented(EObject represented) {
-		this.__representedElement = represented;
-	}
-
-
-}
-
-[/template]
-
-[query public abstractRepresentingClassPath(genPackage : GenPackage, className : String) : String
-	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
-		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl
deleted file mode 100644
index 4e80f3a0cf3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl
+++ /dev/null
@@ -1,1029 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module Class('http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::papyrus::facade::codegen::genclass::genDeclaredFields /]
-[import org::eclipse::papyrus::facade::codegen::genclass::genFeature /]
-[import org::eclipse::papyrus::facade::codegen::genclass::genOperation /]
-[import org::eclipse::papyrus::facade::codegen::genclass::eUnset /]
-[import org::eclipse::papyrus::facade::codegen::genclass::eIsSet /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
-
-[template public genGenClass(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean)]
-[let genPackage : GenPackage = genClass.genPackage]
-[let genModel : GenModel = genPackage.genModel]
-[let isJDK50 : Boolean = genModel.isJDK50()]
-[comment the two following booleans are passed as arguments to this template/]
-[comment] final boolean isInterface = Boolean.TRUE.equals(((Object['[]'/])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object['[]'/])argument)[2]);[/comment]
-[let isGWT : Boolean = genModel.runtimePlatform = GenRuntimePlatform::GWT]
-[let publicStaticFinalFlag : String = if isImplementation then 'public static final ' else '' endif]
-[let singleWildcard : String = if isJDK50 then '<?>' else '' endif]
-[let negativeOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' - ' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
-[let positiveOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' + ' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
-[let negativeOperationOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' - EOPERATION_OFFSET_CORRECTION' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
-[let positiveOperationOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' + EOPERATION_OFFSET_CORRECTION' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
-
-[let packageName : String = if (isInterface) then
-		genPackage.getInterfacePackageName()
-	else
-		genPackage.getClassPackageName()
-	endif]
-[let className : String = if (isImplementation) then
-		genClass.getClassName()
-	else
-		genClass.getInterfaceName()
-	endif]
-
-[genModel.initializeImportManager(genPackage, packageName, className)/]
-[if (isImplementation)]
-	[genClass.addClassPseudoImports()/]
-[/if]
-
-
-
-[file (genClass.classFilePath(isInterface, isImplementation), false, 'UTF-8')]
-[genClass.includeHeader()/]
-[if (isInterface) ]
-package [genPackage.getInterfacePackageName()/];
-[else]
-package [genPackage.getClassPackageName()/];
-[/if]
-[let content : String = genClass.classFileContent(isInterface, isImplementation, genPackage, genModel, isJDK50, isGWT, publicStaticFinalFlag, singleWildcard, negativeOffsetCorrection, positiveOffsetCorrection, negativeOperationOffsetCorrection, positiveOperationOffsetCorrection)]
-
-[genClass.genSortedImports(isInterface, isImplementation).trim()/]
-
-[content/]
-[/let]
-[/file]
-
-
-
-[/let]
-[/let]
-
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/template]
-
-[template protected classFileContent(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isGWT : Boolean, publicStaticFinalFlag : String, singleWildcard : String, negativeOffsetCorrection : String, positiveOffsetCorrection : String, negativeOperationOffsetCorrection : String, positiveOperationOffsetCorrection : String) post(trim())]
-[if (isInterface)]
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>[genClass.getFormattedName()/]</b></em>'.
- * <!-- end-user-doc -->
-  [if (genClass.hasDocumentation())]
- *
- * <!-- begin-model-doc -->
- * [genClass.getDocumentation(genModel.getIndentation())/]
- * <!-- end-model-doc -->
-  [/if]
- *
-  [if (not genClass.genFeatures->isEmpty())]
- * <p>
- * The following features are supported:
- * <ul>
-    [for (genFeature : GenFeature | genClass.genFeatures)]
-      [if (not genFeature.isSuppressedGetVisibility())]
- *   <li>{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}</li>
-      [/if]
-    [/for]
- * </ul>
- * </p>
-  [/if]
- *
-  [if (not genModel.suppressEMFMetaData)]
- * @see [genPackage.getQualifiedPackageInterfaceName()/]#get[genClass.getClassifierAccessorName()/]()
-  [/if]
-  [if (not genModel.suppressEMFModelTags)]
-    [let modelInfoLines : Sequence(String) = genClass.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
-      [if (modelInfoLines->isEmpty())]
- * @model
-      [else]
- * @model [modelInfoLines->sep(genModel.getLineDelimiter() + ' *        ')/]
-      [/if]
-    [/let]
-  [/if]
-  [if (genClass.needsRootExtendsInterfaceExtendsTag())]
- * @extends [genModel.getImportedName(genModel.rootExtendsInterface)/]
-  [/if]
- * @generated
- */
-[else]
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>[genClass.getFormattedName()/]</b></em>'.
- * <!-- end-user-doc -->
- * <p>
-  [if (not genClass.getImplementedGenFeatures()->isEmpty())]
- * The following features are implemented:
- * <ul>
-    [for (genFeature : GenFeature | genClass.getImplementedGenFeatures())]
- *   <li>{@link [genClass.getQualifiedClassName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}</li>
-    [/for]
- * </ul>
-  [/if]
- * </p>
- *
- * @generated
- */
-[/if]
-[if (isImplementation) ]
-public[if (genClass.isAbstract()) ] abstract[/if] class [genClass.getClassName()/][genClass.getTypeParameters().trim()/][if (genClass.ecoreClass.eSuperTypes->isEmpty()) ] extends [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.AbstractRepresentingElement')/] [else] [genClass.getClassExtends()/] [/if][genClass.getClassImplements()/] {
-
-
-[else]
-public interface [genClass.getInterfaceName()/][genClass.getTypeParameters().trim()/][genClass.getInterfaceExtends()/], [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]  {
-
-	[comment]public [genModel.getImportedName('org.eclipse.uml2.uml.Element')/] get__Represented();
-
-	public void set__Represented([genModel.getImportedName('org.eclipse.uml2.uml.Element')/] represented);[/comment]
-
-[/if]
-[if (genModel.hasCopyrightField()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
-
-[/if]
-[if (isImplementation and genModel.getDriverNumber() <> null) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final [genModel.getImportedName('java.lang.String')/] mofDriverNumber = "[genModel.getDriverNumber()/]";[genModel.getNonNLS()/]
-
-[/if]
-[if (isImplementation and genClass.isJavaIOSerializable()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final long serialVersionUID = 1L;
-
-[/if]
-[if (isImplementation and genModel.isVirtualDelegation())]
-  [let eVirtualValuesField : String = genClass.getEVirtualValuesField()]
-  [if (genClass.getEVirtualValuesField() <> null) ]
-	/**
-	 * An array of objects representing the values of non-primitive features.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-      [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-      [/if]
-	protected Object['[]'/] [genClass.getEVirtualValuesField()/];
-
-  [/if]
-  [let eVirtualIndexBitFields : Sequence(String) = genClass.getEVirtualIndexBitFields()]
-    [if (not eVirtualIndexBitFields->isEmpty()) ]
-      [for (eVirtualIndexBitField : String | eVirtualIndexBitFields)]
-	/**
-	 * A bit field representing the indices of non-primitive feature values.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-      [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-      [/if]
-	protected int [eVirtualIndexBitField/];
-
-      [/for]
-    [/if]
-  [/let]
-  [/let]
-[/if]
-[if (isImplementation and genClass.isModelRoot() and genModel.isBooleanFlagsEnabled() and genModel.booleanFlagsReservedBits = -1) ]
-	/**
-	 * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-      [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-      [/if]
-	protected int [genModel.booleanFlagsField/] = 0;
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation) ]
-  [for (genFeature : GenFeature | genClass.getDeclaredFieldGenFeatures())]
-[genFeature.genDeclaredFields(genClass, genModel, isGWT, isJDK50)/][/for]
-[/if]
-[if (isImplementation and genClass.hasOffsetCorrection() and not genClass.getImplementedGenFeatures()->isEmpty()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int [genClass.getDefaultOffsetCorrectionField()/] = [genClass.getQualifiedClassifierAccessor()/].getFeatureID([genClass.getImplementedGenFeatures()->at(1).oclAsType(GenFeature).getQualifiedFeatureAccessor()/]) - [genClass.getQualifiedFeatureID(genClass.getImplementedGenFeatures()->at(1).oclAsType(GenFeature))/];
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation) ]
-  [for (genFeature : GenFeature | genClass.getImplementedGenFeatures())]
-    [let reverseFeature : GenFeature = genFeature.getReverse()]
-      [if (reverseFeature <> null and reverseFeature.genClass.hasOffsetCorrection()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int [genClass.getOffsetCorrectionField(genFeature)/] = [reverseFeature.genClass.getQualifiedClassifierAccessor()/].getFeatureID([reverseFeature.getQualifiedFeatureAccessor()/]) - [reverseFeature.genClass.getQualifiedFeatureID(reverseFeature)/];
-
-      [/if]
-    [/let]
-  [/for]
-[/if]
-[if (genModel.operationReflection and isImplementation and genClass.hasOffsetCorrection() and not genClass.getImplementedGenOperations()->isEmpty()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final int "EOPERATION_OFFSET_CORRECTION" = [genClass.getQualifiedClassifierAccessor()/].getOperationID([genClass.getImplementedGenOperations()->at(1).oclAsType(GenOperation).getQualifiedOperationAccessor()/]) - [genClass.getQualifiedOperationID(genClass.getImplementedGenOperations()->at(1).oclAsType(GenOperation))/];
-
-[/if]
-[if (isImplementation) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[if (genModel.publicConstructors) ]public[else]protected[/if] [genClass.getClassName()/]() {
-		super();
-		[if (not genClass.isAbstract()) ] 
-		__representedElement =  [genClass.ecoreClass.getUMLFactory(genModel)/].eINSTANCE.create[genClass.ecoreClass.getUMLMetaElement(genModel)/]();
-
-		boolean adapterExists = false;
-		for([genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/] adapter : __representedElement.eAdapters()) {
-			if(adapter instanceof [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]) {
-				(([genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/])adapter).set__Representing(this);
-				adapterExists = true;
-			}
-		}
-
-		if(!adapterExists) {
-			[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/] adapter = new [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]();
-			adapter.set__Representing(this);
-			__representedElement.eAdapters().add(adapter);
-		}
-		[/if]
-
-
-
-  [for (genFeature : GenFeature | genClass.getFlagGenFeaturesWithDefault()) ]
-		[genClass.getFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_EFLAG[if (not genFeature.isBooleanType()) ]_DEFAULT[/if];
-  [/for]
-	}
-
-
-	[if ( genClass.ecoreClass.getNonAssociationStereotypeQualifiedNames(genModel) <> '' )]
-
-	@Override
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/]  eBasicSetContainer([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] newContainer, int newContainerFeatureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-		[genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] chain = super.eBasicSetContainer(newContainer, newContainerFeatureID, msgs);
-		if(newContainer != null) {
-			String['[]'/] stereotypesQualifiedNames = { [genClass.ecoreClass.getNonAssociationStereotypeQualifiedNames(genModel)/] };
-
-			for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
-				if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) == null) {
-					[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
-					if(stereotype != null) {
-						(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).applyStereotype(stereotype);
-					} else {
-						System.err.println("Problem: cannot apply stereotype " + stereoQualifiedName);
-					}
-				}
-			}
-		}
-
-		return chain;
-	}
-
-	[/if]
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	protected [genModel.getImportedName('org.eclipse.emf.ecore.EClass')/] eStaticClass() {
-		return [genClass.getQualifiedClassifierAccessor()/];
-	}
-
-[/if]
-
-[for (genFeature : GenFeature | if isImplementation then genClass.getImplementedGenFeatures() else genClass.getDeclaredGenFeatures() endif)]
-[genFeature.genFeature(genClass, genPackage, genModel, isJDK50, isInterface, isImplementation, positiveOffsetCorrection, negativeOffsetCorrection, singleWildcard)/][/for]
-
-[for (genOperation : GenOperation | if isImplementation then genClass.getImplementedGenOperations() else genClass.getDeclaredGenOperations() endif)]
-[genOperation.genOperation(genClass, genPackage, genModel, isJDK50, isInterface, isImplementation, isGWT)/][/for]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEInverseAddGenFeatures()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useGenerics())]
-    [if (genClass.getEInverseAddGenFeatures()->filter(GenFeature)->select(f : GenFeature | f.isUncheckedCast(genClass))->size() > 0)]
-	@SuppressWarnings("unchecked")
-    [/if]
-  [/if]
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eInverseAdd([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] otherEnd, int featureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-		switch (featureID[negativeOffsetCorrection/]) {
-[for (genFeature : GenFeature | genClass.getEInverseAddGenFeatures())]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-  [if (genFeature.isListType())]
-    [let cast : String = '('
-        + genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')
-        + if (not genModel.useGenerics()) then
-            ')'
-          else
-            '<'
-            + genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')
-   	        + '>)('
-   	        + genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')
-   	        + '<?>)'
-          endif]
-      [if (genFeature.isMapType() and genFeature.isEffectiveSuppressEMFTypes()) ]
-				return (([cast/]([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).basicAdd(otherEnd, msgs);
-      [else]
-				return ([cast/][genFeature.getGetAccessor()/]()).basicAdd(otherEnd, msgs);
-      [/if]
-    [/let]
-  [else][if (genFeature.isContainer()) ]
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-    [if (genFeature.isBasicSet()) ]
-				return basicSet[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])otherEnd, msgs);
-    [else]
-				return eBasicSetContainer(otherEnd, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
-    [/if]
-  [else]
-    [if (genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
-				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
-    [else][if (genFeature.isVolatile() or genClass.getImplementingGenModel(genFeature).isDynamicDelegation()) ]
-				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = [if (genFeature.isResolveProxies()) ]basicGet[genFeature.getAccessorName()/][else][genFeature.getGetAccessor()/][/if]();
-    [/if][/if]
-				if ([genFeature.getSafeName()/] != null)
-    [if (genFeature.isEffectiveContains()) ]
-					msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, msgs);
-    [else]
-      [let reverseFeature : GenFeature = genFeature.getReverse()]
-        [let targetClass : GenClass = reverseFeature.genClass]
-          [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
-					msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
-          [/let]
-        [/let]
-      [/let]
-    [/if]
-				return basicSet[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])otherEnd, msgs);
-  [/if][/if]
-[/for]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-[else]
-		return eDynamicInverseAdd(otherEnd, featureID, msgs);
-[/if]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEInverseRemoveGenFeatures()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eInverseRemove([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] otherEnd, int featureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-		switch (featureID[negativeOffsetCorrection/]) {
-[for (genFeature : GenFeature | genClass.getEInverseRemoveGenFeatures())]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-  [if (genFeature.isListType()) ]
-    [if (genFeature.isMapType() and genFeature.isEffectiveSuppressEMFTypes()) ]
-				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])(([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).basicRemove(otherEnd, msgs);
-    [else][if (genFeature.isWrappedFeatureMapType()) ]
-				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap()).basicRemove(otherEnd, msgs);
-    [else]
-				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])[genFeature.getGetAccessor()/]()).basicRemove(otherEnd, msgs);
-    [/if][/if]
-  [else ][if (genFeature.isContainer() and not genFeature.isBasicSet()) ]
-				return eBasicSetContainer(null, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
-  [else][if (genFeature.isUnsettable()) ]
-				return basicUnset[genFeature.getAccessorName()/](msgs);
-  [else]
-				return basicSet[genFeature.getAccessorName()/](null, msgs);
-  [/if][/if][/if]
-[/for]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-[else]
-		return eDynamicInverseRemove(otherEnd, featureID, msgs);
-[/if]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEBasicRemoveFromContainerGenFeatures()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eBasicRemoveFromContainerFeature([genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
-		switch (eContainerFeatureID()[negativeOffsetCorrection/]) {
-[for (genFeature : GenFeature | genClass.getEBasicRemoveFromContainerGenFeatures())]
-  [let reverseFeature : GenFeature = genFeature.getReverse()]
-    [let targetClass : GenClass = reverseFeature.genClass]
-      [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-				return eInternalContainer().eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
-      [/let]
-    [/let]
-  [/let]
-[/for]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eBasicRemoveFromContainerFeature(msgs);
-[else]
-		return eDynamicBasicRemoveFromContainer(msgs);
-[/if]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEGetGenFeatures()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID[negativeOffsetCorrection/]) {
-[for (genFeature : GenFeature | genClass.getEGetGenFeatures())]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-  [if (genFeature.isPrimitiveType()) ]
-    [if (isJDK50) ]
-				return [genFeature.getGetAccessor()/]();
-    [else][if (genFeature.isBooleanType()) ]
-				return [genFeature.getGetAccessor()/]() ? Boolean.TRUE : Boolean.FALSE;
-    [else]
-				return new [genFeature.getObjectType(genClass)/]([genFeature.getGetAccessor()/]());
-    [/if][/if]
-  [else][if (genFeature.isResolveProxies() and not genFeature.isListType()) ]
-				if (resolve) return [genFeature.getGetAccessor()/]();
-				return basicGet[genFeature.getAccessorName()/]();
-  [else][if (genFeature.isMapType()) ]
-    [if (genFeature.isEffectiveSuppressEMFTypes()) ]
-				if (coreType) return (([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap();
-				else return [genFeature.getGetAccessor()/]();
-    [else]
-				if (coreType) return [genFeature.getGetAccessor()/]();
-				else return [genFeature.getGetAccessor()/]().map();
-    [/if]
-  [else][if (genFeature.isWrappedFeatureMapType()) ]
-				if (coreType) return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap();
-				return [genFeature.getGetAccessor()/]();
-  [else][if (genFeature.isFeatureMapType()) ]
-				if (coreType) return [genFeature.getGetAccessor()/]();
-				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)[genFeature.getGetAccessor()/]()).getWrapper();
-  [else]
-				return [genFeature.getGetAccessor()/]();
-  [/if][/if][/if][/if][/if]
-[/for]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eGet(featureID, resolve, coreType);
-[else]
-		return eDynamicGet(featureID, resolve, coreType);
-[/if]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyESetGenFeatures()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useGenerics()) ]
-    [if (genClass.getESetGenFeatures()->filter(GenFeature)->select(f : GenFeature| f.isUncheckedCast(genClass) and not f.isFeatureMapType() and not f.isMapType())->notEmpty()) ]
-	@SuppressWarnings("unchecked")
-    [/if]
-  [/if]
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID[negativeOffsetCorrection/]) {
-  [for (genFeature : GenFeature | genClass.getESetGenFeatures())]
-			case [genClass.getQualifiedFeatureID(genFeature)/]:
-    [if (genFeature.isListType()) ]
-      [if (genFeature.isWrappedFeatureMapType()) ]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap()).set(newValue);
-      [else][if (genFeature.isFeatureMapType()) ]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)[genFeature.getGetAccessor()/]()).set(newValue);
-      [else][if (genFeature.isMapType()) ]
-        [if (genFeature.isEffectiveSuppressEMFTypes()) ]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Setting)(([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).set(newValue);
-        [else]
-				(([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Setting)[genFeature.getGetAccessor()/]()).set(newValue);
-        [/if]
-      [else]
-				[genFeature.getGetAccessor()/]().clear();
-				[genFeature.getGetAccessor()/]().addAll(([genModel.getImportedName('java.util.Collection')/][if (isJDK50) ]<? extends [genFeature.getListItemType(genClass)/]>[/if])newValue);
-      [/if][/if][/if]
-    [else][if (not isJDK50 and genFeature.isPrimitiveType()) ]
-				set[genFeature.getAccessorName()/]((([genFeature.getObjectType(genClass)/])newValue).[genFeature.getPrimitiveValueFunction()/]());
-    [else]
-				set[genFeature.getAccessorName()/]([if (genFeature.getTypeGenDataType() = null or not genFeature.getTypeGenDataType().isObjectType() or genFeature.getRawType() <> genFeature.getType(genClass)) ]([genFeature.getObjectType(genClass)/])[/if]newValue);
-    [/if][/if]
-				return;
-  [/for]
-		}
-  [if (genModel.minimalReflectiveMethods) ]
-		super.eSet(featureID, newValue);
-  [else]
-		eDynamicSet(featureID, newValue);
-  [/if]
-	}
-
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEUnsetGenFeatures()) ]
-[genClass.eUnset(genModel, negativeOffsetCorrection)/]
-[/if]
-[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEIsSetGenFeatures()) ]
-[genClass.eIsSet(genModel, positiveOffsetCorrection, negativeOffsetCorrection)/]
-[/if]
-[if (isImplementation and (not genClass.getMixinGenFeatures()->isEmpty() or genClass.hasOffsetCorrection() and not genClass.genFeatures->isEmpty())) ]
-  [if (not genClass.getMixinGenFeatures()->isEmpty()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-    [/if]
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class[singleWildcard/] baseClass) {
-    [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
-		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
-			switch (derivedFeatureID[negativeOffsetCorrection/]) {
-      [for (genFeature : GenFeature | mixinGenClass.genFeatures)]
-				case [genClass.getQualifiedFeatureID(genFeature)/]: return [mixinGenClass.getQualifiedFeatureID(genFeature)/];
-      [/for]
-				default: return -1;
-			}
-		}
-    [/for]
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-  [/if]
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class[singleWildcard/] baseClass) {
-  [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
-		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
-			switch (baseFeatureID) {
-    [for (genFeature : GenFeature | mixinGenClass.genFeatures)]
-				case [mixinGenClass.getQualifiedFeatureID(genFeature)/]: return [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/];
-    [/for]
-				default: return -1;
-			}
-		}
-  [/for]
-  [if (genClass.hasOffsetCorrection() and not genClass.genFeatures->isEmpty()) ]
-		if (baseClass == [genClass.getRawImportedInterfaceName()/].class) {
-			switch (baseFeatureID[negativeOffsetCorrection/]) {
-    [for (genFeature : GenFeature | genClass.genFeatures)]
-				case [genClass.getQualifiedFeatureID(genFeature)/]: return [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/];
-    [/for]
-				default: return -1;
-			}
-		}
-  [/if]
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-[/if]
-[if (genModel.operationReflection
-		and isImplementation
-		and (not genClass.getMixinGenOperations()->isEmpty()
-			or not genClass.overridesGenOperations()
-			or genClass.hasOffsetCorrection() and not genClass.genOperations->isEmpty()))]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public int eDerivedOperationID(int baseOperationID, Class[singleWildcard/] baseClass) {
-  [for (extendedGenClass : GenClass | genClass.getExtendedGenClasses())]
-    [let extendedImplementedGenOperations : Sequence(GenOperation) = extendedGenClass.getImplementedGenOperations()]
-	  [let implementedGenOperations : Sequence(GenOperation)  = genClass.getImplementedGenOperations()]
-    [if (not genClass.overridesExtendedGenOperations(extendedGenClass)) ]
-		if (baseClass == [extendedGenClass.getRawImportedInterfaceName()/].class) {
-			switch (baseOperationID) {
-      [for (genOperation : GenOperation | extendedImplementedGenOperations)]
-        [let overrideGenOperation : GenOperation = genClass.getOverrideGenOperation(genOperation)]
-          [if (implementedGenOperations->includes(overrideGenOperation)) ]
-				case [extendedGenClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(overrideGenOperation)/][positiveOperationOffsetCorrection/];
-          [/if]
-        [/let]
-      [/for]
-				default: return super.eDerivedOperationID(baseOperationID, baseClass);
-			}
-		}
-    [/if]
-      [/let]
-    [/let]
-  [/for]
-  [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
-		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
-			switch (baseOperationID) {
-    [for (genOperation : GenOperation | mixinGenClass.genOperations)]
-      [let overrideGenOperation : GenOperation = genClass.getOverrideGenOperation(genOperation)]
-				case [mixinGenClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(if (overrideGenOperation <> null) then overrideGenOperation else genOperation endif)/][positiveOperationOffsetCorrection/];
-      [/let]
-    [/for]
-				default: return -1;
-			}
-		}
-  [/for]
-  [if (genClass.hasOffsetCorrection() and not genClass.genOperations->isEmpty()) ]
-		if (baseClass == [genClass.getRawImportedInterfaceName()/].class) {
-			switch (baseOperationID[negativeOperationOffsetCorrection/]) {
-    [for (genOperation : GenOperation | genClass.genOperations)]
-				case [genClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(genOperation)/][positiveOperationOffsetCorrection/];
-    [/for]
-				default: return -1;
-			}
-		}
-  [/if]
-		return super.eDerivedOperationID(baseOperationID, baseClass);
-	}
-
-[/if]
-[if (isImplementation and genModel.isVirtualDelegation())]
-  [comment][let eVirtualValuesField : String = genClass.getEVirtualValuesField()][/comment]
-    [if (genClass.getEVirtualValuesField() <> null) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-      [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-      [/if]
-	protected Object['[]'/] eVirtualValues() {
-		return [genClass.getEVirtualValuesField()/];
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-      [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-      [/if]
-	protected void eSetVirtualValues(Object['[]'/] newValues) {
-		[genClass.getEVirtualValuesField()/] = newValues;
-	}
-
-    [/if]
-    [let eVirtualIndexBitFields : Sequence(String) = genClass.getEVirtualIndexBitFields()]
-      [if (not eVirtualIndexBitFields->isEmpty())]
-        [let allEVirtualIndexBitFields : Sequence(String) = genClass.getAllEVirtualIndexBitFields()]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-        [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-        [/if]
-	protected int eVirtualIndexBits(int offset) {
-		switch (offset) {
-        [for (field : String | allEVirtualIndexBitFields)]
-			case [i - 1/] :
-				return [field/];
-        [/for]
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-        [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-        [/if]
-	protected void eSetVirtualIndexBits(int offset, int newIndexBits) {
-		switch (offset) {
-        [for (field : String | allEVirtualIndexBitFields)]
-			case [i - 1/] :
-				[field/] = newIndexBits;
-				break;
-        [/for]
-			default :
-				throw new IndexOutOfBoundsException();
-		}
-	}
-
-        [/let]
-      [/if]
-    [/let]
-  [comment][/let][/comment]
-[/if]
-[if (genModel.operationReflection and isImplementation and not genClass.getImplementedGenOperations()->isEmpty()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-  [let genOpList : Sequence(GenOperation) = if (genModel.minimalReflectiveMethods) then genClass.getImplementedGenOperations() else genClass.getAllGenOperations() endif]
-    [if (genOpList.genParameters
-		->flatten()
-		->filter(GenParameter)
-		->select(genParameter : GenParameter | genParameter.isUncheckedCast())
-		->notEmpty())]
-	@SuppressWarnings("unchecked")
-    [/if]
-	public Object eInvoke(int operationID, [genModel.getImportedName('org.eclipse.emf.common.util.EList')/][singleWildcard/] arguments) throws [genModel.getImportedName(if (isGWT) then 'org.eclipse.emf.common.util.InvocationTargetException' else 'java.lang.reflect.InvocationTargetException' endif)/] {
-		switch (operationID[negativeOperationOffsetCorrection/]) {
-[for (genOperation : GenOperation | genOpList)]
-  [let genParameters : OrderedSet(GenParameter) = genOperation.genParameters]
-    [let size : Integer = genParameters->size()]
-			case [genClass.getQualifiedOperationID(genOperation)/]:
-      [if (genOperation.isVoid()) ]
-				[genOperation.getName()/]([for (genParameter : GenParameter | genParameters)][if (not isJDK50 and genParameter.isPrimitiveType()) ]([/if][if (genParameter.getTypeGenDataType() = null or not genParameter.getTypeGenDataType().isObjectType() or genParameter.getRawType() <> genParameter.getType(genClass)) ]([genParameter.getObjectType(genClass)/])[/if]arguments.get([i/])[if (not isJDK50 and genParameter.isPrimitiveType()) ]).[genParameter.getPrimitiveValueFunction()/]()[/if][if (size > 1 and i < size) ], [/if][/for]);
-				return null;
-      [else]
-				return [if (not isJDK50 and genOperation.isPrimitiveType())]new [genOperation.getObjectType(genClass)/]([/if][genOperation.getName()/]([for (genParameter : GenParameter | genParameters)][if (not isJDK50 and genParameter.isPrimitiveType())]([/if][if (genParameter.getTypeGenDataType() = null or not genParameter.getTypeGenDataType().isObjectType() or genParameter.getRawType() <> genParameter.getType(genClass)) ]([genParameter.getObjectType(genClass)/])[/if]arguments.get([i - 1/])[if (not isJDK50 and genParameter.isPrimitiveType()) ]).[genParameter.getPrimitiveValueFunction()/]()[/if][if (i < size) ], [/if][/for])[if (not isJDK50 and genOperation.isPrimitiveType()) ])[/if];
-      [/if]
-    [/let]
-  [/let]
-[/for]
-  [/let]
-		}
-[if (genModel.minimalReflectiveMethods) ]
-		return super.eInvoke(operationID, arguments);
-[else]
-		return eDynamicInvoke(operationID, arguments);
-[/if]
-	}
-
-[/if]
-[if (not genClass.hasImplementedToStringGenOperation() and isImplementation and not genModel.reflectiveDelegation and not genModel.isDynamicDelegation() and not genClass.getToStringGenFeatures()->isEmpty()) ]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation()) ]
-	@Override
-  [/if]
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-    [for (genFeature : GenFeature | genClass.getToStringGenFeatures())]
-      [if (i = 1)]
-		result.append(" ([genFeature.getName()/]: ");[genModel.getNonNLS()/]
-      [else]
-		result.append(", [genFeature.getName()/]: ");[genModel.getNonNLS()/]
-      [/if]
-      [if (genFeature.isUnsettable() and not genFeature.isListType()) ]
-        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
-		if (eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/])) result.append(eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/])); else result.append("<unset>");[genModel.getNonNLS()/]
-        [else]
-          [if (genClass.isFlag(genFeature)) ]
-            [if (genFeature.isBooleanType()) ]
-		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append(([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0); else result.append("<unset>");[genModel.getNonNLS()/]
-            [else]
-		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append([genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET]); else result.append("<unset>");[genModel.getNonNLS()/]
-            [/if]
-          [else]
-		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append([genFeature.getSafeName()/]); else result.append("<unset>");[genModel.getNonNLS()/]
-          [/if]
-        [/if]
-      [else]
-        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
-		result.append(eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/][if (not genFeature.isListType() and not genFeature.isReferenceType())], [genFeature.getEDefault()/][/if]));
-        [else]
-          [if (genClass.isFlag(genFeature)) ]
-          [if (genFeature.isBooleanType()) ]
-		result.append(([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0);
-          [else]
-		result.append([genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET]);
-          [/if]
-          [else]
-		result.append([genFeature.getSafeName()/]);
-          [/if]
-        [/if]
-      [/if]
-    [/for]
-		result.append(')');
-		return result.toString();
-	}
-
-[/if]
-[if (isImplementation and genClass.isMapEntry())]
-[let keyFeature : GenFeature = genClass.getMapEntryKeyFeature()]
-[let valueFeature : GenFeature = genClass.getMapEntryValueFeature()]
-[let objectType : String = genModel.getImportedName('java.lang.Object')]
-[let keyType : String = if isJDK50 then keyFeature.getObjectType(genClass) else objectType endif]
-[let valueType : String = if isJDK50 then valueFeature.getObjectType(genClass) else objectType endif]
-[let eMapType : String = genModel.getImportedName('org.eclipse.emf.common.util.EMap') + (if isJDK50 then '<' + keyType + ', ' + valueType + '>' else '' endif)]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-      [if (isGWT) ]
-	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
-      [/if]
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			[objectType/] theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public [keyType/] getKey() {
-  [if (not isJDK50 and keyFeature.isPrimitiveType()) ]
-		return new [keyFeature.getObjectType(genClass)/](getTypedKey());
-  [else]
-		return getTypedKey();
-  [/if]
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey([keyType/] key) {
-  [if (keyFeature.isListType()) ]
-		getTypedKey().addAll([if (not genModel.useGenerics()) ]([genModel.getImportedName('java.util.Collection')/])[/if]key);
-  [else][if (isJDK50)]
-		setTypedKey(key);
-  [else][if (keyFeature.isPrimitiveType())]
-		setTypedKey((([keyFeature.getObjectType(genClass)/])key).[keyFeature.getPrimitiveValueFunction()/]());
-  [else]
-		setTypedKey(([keyFeature.getImportedType(genClass)/])key);
-  [/if][/if][/if]
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public [valueType/] getValue() {
-  [if (not isJDK50 and valueFeature.isPrimitiveType()) ]
-		return new [valueFeature.getObjectType(genClass)/](getTypedValue());
-  [else]
-		return getTypedValue();
-  [/if]
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public [valueType/] setValue([valueType/] value) {
-		[valueType/] oldValue = getValue();
-  [if (valueFeature.isListType()) ]
-		getTypedValue().clear();
-		getTypedValue().addAll([if (not genModel.useGenerics()) ]([genModel.getImportedName('java.util.Collection')/])[/if]value);
-  [else][if (isJDK50)]
-		setTypedValue(value);
-  [else][if (valueFeature.isPrimitiveType()) ]
-		setTypedValue((([valueFeature.getObjectType(genClass)/])value).[valueFeature.getPrimitiveValueFunction()/]());
-  [else]
-		setTypedValue(([valueFeature.getImportedType(genClass)/])value);
-  [/if][/if][/if]
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useGenerics()) ]
-	@SuppressWarnings("unchecked")
-  [/if]
-	public [eMapType/] getEMap() {
-		[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] container = eContainer();
-		return container == null ? null : ([eMapType/])container.eGet(eContainmentFeature());
-	}
-
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/if]
-} //[if (isInterface)] [genClass.getInterfaceName()/][else][genClass.getClassName()/][/if]
-[/template]
-
-[query public classFilePath(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean) : String
-	= genClass.getGenModel().extractSourceDirectory(genClass.getGenModel().modelDirectory) + '/' +
-		if isInterface then
-			genClass.getQualifiedInterfaceName().toPath()
-		else
-			genClass.getQualifiedClassName().toPath()
-		endif +
-		'.java' /]
-
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java
deleted file mode 100644
index 45c6ac13a9d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008, 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Obeo - initial API and implementation

- *     CEA LIST - Modification to support Facade code generation

- *******************************************************************************/

-package org.eclipse.papyrus.facade.codegen.genfacade;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.acceleo.common.preference.AcceleoPreferences;

-import org.eclipse.acceleo.engine.event.IAcceleoTextGenerationListener;

-import org.eclipse.acceleo.engine.generation.strategy.IAcceleoGenerationStrategy;

-import org.eclipse.acceleo.engine.service.AbstractAcceleoGenerator;

-import org.eclipse.emf.common.util.BasicMonitor;

-import org.eclipse.emf.common.util.Monitor;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-/**

- * Entry point of the 'GenFacade' generation module.

- *

- * @generated

- */

-public class GenFacade extends AbstractAcceleoGenerator {

-

-	/**

-	 * The name of the module.

-	 *

-	 * @generated

-	 */

-	public static final String MODULE_FILE_NAME = "/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade"; //$NON-NLS-1$

-

-	/**

-	 * The name of the templates that are to be generated.

-	 *

-	 * @generated

-	 */

-	public static final String[] TEMPLATE_NAMES = { "GenAllGenClass" }; //$NON-NLS-1$

-

-	/**

-	 * The list of properties files from the launch parameters (Launch configuration).

-	 *

-	 * @generated

-	 */

-	private List<String> propertiesFiles = new ArrayList<String>();

-

-	/**

-	 * Allows the public constructor to be used. Note that a generator created

-	 * this way cannot be used to launch generations before one of {@link #initialize(EObject, File, List)} or {@link #initialize(URI, File, List)} is

-	 * called.

-	 * <p>

-	 * The main reason for this constructor is to allow clients of this generation to call it from another Java file, as it allows for the retrieval of {@link #getProperties()} and {@link #getGenerationListeners()}.

-	 * </p>

-	 *

-	 * @generated

-	 */

-	public GenFacade() {
-        // Empty implementation
-    }

-

-	/**

-	 * This allows clients to instantiates a generator with all required information.

-	 *

-	 * @param modelURI

-	 *            URI where the model on which this generator will be used is located.

-	 * @param targetFolder

-	 *            This will be used as the output folder for this generation : it will be the base path

-	 *            against which all file block URLs will be resolved.

-	 * @param arguments

-	 *            If the template which will be called requires more than one argument taken from the model,

-	 *            pass them here.

-	 * @throws IOException

-	 *             This can be thrown in three scenarios : the module cannot be found, it cannot be loaded, or

-	 *             the model cannot be loaded.

-	 * @generated

-	 */

-	public GenFacade(URI modelURI, File targetFolder, List<? extends Object> arguments) throws IOException {
-        initialize(modelURI, targetFolder, arguments);
-    }

-

-	/**

-	 * This allows clients to instantiates a generator with all required information.

-	 *

-	 * @param model

-	 *            We'll iterate over the content of this element to find Objects matching the first parameter

-	 *            of the template we need to call.

-	 * @param targetFolder

-	 *            This will be used as the output folder for this generation : it will be the base path

-	 *            against which all file block URLs will be resolved.

-	 * @param arguments

-	 *            If the template which will be called requires more than one argument taken from the model,

-	 *            pass them here.

-	 * @throws IOException

-	 *             This can be thrown in two scenarios : the module cannot be found, or it cannot be loaded.

-	 * @generated

-	 */

-	public GenFacade(EObject model, File targetFolder, List<? extends Object> arguments) throws IOException {
-        initialize(model, targetFolder, arguments);
-    }

-

-	/**

-	 * This can be used to launch the generation from a standalone application.

-	 *

-	 * @param args

-	 *            Arguments of the generation.

-	 * @generated

-	 */

-	public static void main(String[] args) {
-        try {
-            if (args.length < 2) {
-                System.out.println("Arguments not valid : {model, folder}.");
-            } else {
-                URI modelURI = URI.createFileURI(args[0]);
-                File folder = new File(args[1]);
-                
-                List<String> arguments = new ArrayList<String>();
-                
-                /*
-                 * If you want to change the content of this method, do NOT forget to change the "@generated"
-                 * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
-                 * of the Acceleo module with the main template that has caused the creation of this class will
-                 * revert your modifications.
-                 */
-
-                /*
-                 * Add in this list all the arguments used by the starting point of the generation
-                 * If your main template is called on an element of your model and a String, you can
-                 * add in "arguments" this "String" attribute.
-                 */
-                
-                GenFacade generator = new GenFacade(modelURI, folder, arguments);
-                
-                /*
-                 * Add the properties from the launch arguments.
-                 * If you want to programmatically add new properties, add them in "propertiesFiles"
-                 * You can add the absolute path of a properties files, or even a project relative path.
-                 * If you want to add another "protocol" for your properties files, please override 
-                 * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
-                 * The behavior of the properties loader service is explained in the Acceleo documentation
-                 * (Help -> Help Contents).
-                 */
-                 
-                for (int i = 2; i < args.length; i++) {
-                    generator.addPropertiesFile(args[i]);
-                }
-                
-                generator.doGenerate(new BasicMonitor());
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }

-

-	/**

-	 * Launches the generation described by this instance.

-	 *

-	 * @param monitor

-	 *            This will be used to display progress information to the user.

-	 * @throws IOException

-	 *             This will be thrown if any of the output files cannot be saved to disk.

-	 * @generated NOT

-	 */

-	@Override

-	public void doGenerate(Monitor monitor) throws IOException {

-		/*

-		 * TODO if you wish to change the generation as a whole, override this. The default behavior should

-		 * be sufficient in most cases. If you want to change the content of this method, do NOT forget to

-		 * change the "@generated" tag in the Javadoc of this method to "@generated NOT". Without this new tag,

-		 * any compilation of the Acceleo module with the main template that has caused the creation of this

-		 * class will revert your modifications. If you encounter a problem with an unresolved proxy during the

-		 * generation, you can remove the comments in the following instructions to check for problems. Please

-		 * note that those instructions may have a significant impact on the performances.

-		 */

-

-		// org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model);

-

-		/*

-		 * If you want to check for potential errors in your models before the launch of the generation, you

-		 * use the code below.

-		 */

-

-		// if (model != null && model.eResource() != null) {

-		// List<org.eclipse.emf.ecore.resource.Resource.Diagnostic> errors = model.eResource().getErrors();

-		// for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : errors) {

-		// System.err.println(diagnostic.toString());

-		// }

-		// }

-

-		// super.doGenerate(monitor);

-		EObject model = getModel();

-		if (model instanceof org.eclipse.emf.codegen.ecore.genmodel.GenModel) {

-			((org.eclipse.emf.codegen.ecore.genmodel.GenModel) model).getStaticGenPackages();

-		}

-		boolean formerCacheFlag = AcceleoPreferences.isQueryCacheEnabled();

-		try {

-			AcceleoPreferences.switchQueryCache(false);

-			super.doGenerate(monitor);

-		} finally {

-			AcceleoPreferences.switchQueryCache(formerCacheFlag);

-		}

-	}

-

-	/**

-	 * If this generator needs to listen to text generation events, listeners can be returned from here.

-	 *

-	 * @return List of listeners that are to be notified when text is generated through this launch.

-	 * @generated

-	 */

-	@Override

-	public List<IAcceleoTextGenerationListener> getGenerationListeners() {
-        List<IAcceleoTextGenerationListener> listeners = super.getGenerationListeners();
-        /*
-         * TODO if you need to listen to generation event, add listeners to the list here. If you want to change
-         * the content of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method
-         * to "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template
-         * that has caused the creation of this class will revert your modifications.
-         */
-        return listeners;
-    }

-

-	/**

-	 * If you need to change the way files are generated, this is your entry point.

-	 * <p>

-	 * The default is {@link org.eclipse.acceleo.engine.generation.strategy.DefaultStrategy}; it generates files on the fly. If you only need to preview the results, return a new {@link org.eclipse.acceleo.engine.generation.strategy.PreviewStrategy}. Both of

-	 * these aren't aware of the running Eclipse and can be used standalone.

-	 * </p>

-	 * <p>

-	 * If you need the file generation to be aware of the workspace (A typical example is when you wanna override files that are under clear case or any other VCS that could forbid the overriding), then return a new

-	 * {@link org.eclipse.acceleo.engine.generation.strategy.WorkspaceAwareStrategy}. <b>Note</b>, however, that this <b>cannot</b> be used standalone.

-	 * </p>

-	 * <p>

-	 * All three of these default strategies support merging through JMerge.

-	 * </p>

-	 *

-	 * @return The generation strategy that is to be used for generations launched through this launcher.

-	 * @generated

-	 */

-	@Override

-	public IAcceleoGenerationStrategy getGenerationStrategy() {
-        return super.getGenerationStrategy();
-    }

-

-	/**

-	 * This will be called in order to find and load the module that will be launched through this launcher.

-	 * We expect this name not to contain file extension, and the module to be located beside the launcher.

-	 *

-	 * @return The name of the module that is to be launched.

-	 * @generated

-	 */

-	@Override

-	public String getModuleName() {
-        return MODULE_FILE_NAME;
-    }

-

-	/**

-	 * If the module(s) called by this launcher require properties files, return their qualified path from

-	 * here.Take note that the first added properties files will take precedence over subsequent ones if they

-	 * contain conflicting keys.

-	 *

-	 * @return The list of properties file we need to add to the generation context.

-	 * @see java.util.ResourceBundle#getBundle(String)

-	 * @generated

-	 */

-	@Override

-	public List<String> getProperties() {
-        /*
-         * If you want to change the content of this method, do NOT forget to change the "@generated"
-         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
-         * of the Acceleo module with the main template that has caused the creation of this class will
-         * revert your modifications.
-         */
-
-        /*
-         * TODO if your generation module requires access to properties files, add their qualified path to the list here.
-         * 
-         * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse
-         * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties
-         * files to the "propertiesFiles" list:
-         * 
-         * final String prefix = "platform:/plugin/";
-         * final String pluginName = "org.eclipse.acceleo.module.sample";
-         * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/";
-         * final String fileName = "default.properties";
-         * propertiesFiles.add(prefix + pluginName + packagePath + fileName);
-         * 
-         * With this mechanism, you can load properties files from your plugin or from another plugin.
-         * 
-         * You may want to load properties files from the file system, for that you need to add the absolute path of the file:
-         * 
-         * propertiesFiles.add("C:\Users\MyName\MyFile.properties");
-         * 
-         * If you want to let your users add properties files located in the same folder as the model:
-         *
-         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { 
-         *     propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource()));
-         * }
-         * 
-         * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents).
-         */
-        return propertiesFiles;
-    }

-

-	/**

-	 * Adds a properties file in the list of properties files.

-	 *

-	 * @param propertiesFile

-	 *            The properties file to add.

-	 * @generated

-	 * @since 3.1

-	 */

-	@Override

-	public void addPropertiesFile(String propertiesFile) {
-        this.propertiesFiles.add(propertiesFile);
-    }

-

-	/**

-	 * This will be used to get the list of templates that are to be launched by this launcher.

-	 *

-	 * @return The list of templates to call on the module {@link #getModuleName()}.

-	 * @generated

-	 */

-	@Override

-	public String[] getTemplateNames() {
-        return TEMPLATE_NAMES;
-    }

-

-	/**

-	 * This can be used to update the resource set's package registry with all needed EPackages.

-	 *

-	 * @param resourceSet

-	 *            The resource set which registry has to be updated.

-	 * @generated

-	 */

-	@Override

-	public void registerPackages(ResourceSet resourceSet) {
-        super.registerPackages(resourceSet);
-        if (!isInWorkspace(org.eclipse.emf.ecore.EcorePackage.class)) {
-            resourceSet.getPackageRegistry().put(org.eclipse.emf.ecore.EcorePackage.eINSTANCE.getNsURI(), org.eclipse.emf.ecore.EcorePackage.eINSTANCE);
-        }
-        if (!isInWorkspace(org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.class)) {
-            resourceSet.getPackageRegistry().put(org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.eINSTANCE.getNsURI(), org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.eINSTANCE);
-        }
-        
-        /*
-         * If you want to change the content of this method, do NOT forget to change the "@generated"
-         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
-         * of the Acceleo module with the main template that has caused the creation of this class will
-         * revert your modifications.
-         */
-        
-        /*
-         * If you need additional package registrations, you can register them here. The following line
-         * (in comment) is an example of the package registration for UML.
-         * 
-         * You can use the method  "isInWorkspace(Class c)" to check if the package that you are about to
-         * register is in the workspace.
-         * 
-         * To register a package properly, please follow the following conventions:
-         *
-         * If the package is located in another plug-in, already installed in Eclipse. The following content should
-         * have been generated at the beginning of this method. Do not register the package using this mechanism if
-         * the metamodel is located in the workspace.
-         *  
-         * if (!isInWorkspace(UMLPackage.class)) {
-         *     // The normal package registration if your metamodel is in a plugin.
-         *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
-         * }
-         * 
-         * If the package is located in another project in your workspace, the plugin containing the package has not
-         * been register by EMF and Acceleo should register it automatically. If you want to use the generator in
-         * stand alone, the regular registration (seen a couple lines before) is needed.
-         * 
-         * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents).
-         */
-    }

-

-	/**

-	 * This can be used to update the resource set's resource factory registry with all needed factories.

-	 *

-	 * @param resourceSet

-	 *            The resource set which registry has to be updated.

-	 * @generated

-	 */

-	@Override

-	public void registerResourceFactories(ResourceSet resourceSet) {
-        super.registerResourceFactories(resourceSet);
-        /*
-         * If you want to change the content of this method, do NOT forget to change the "@generated"
-         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
-         * of the Acceleo module with the main template that has caused the creation of this class will
-         * revert your modifications.
-         */
-        
-        /*
-         * TODO If you need additional resource factories registrations, you can register them here. the following line
-         * (in comment) is an example of the resource factory registration for UML.
-         *
-         * If you want to use the generator in stand alone, the resource factory registration will be required.
-         *  
-         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). 
-         */ 
-        
-        // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
-    }

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl
deleted file mode 100644
index 3f688fde6df..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl
+++ /dev/null
@@ -1,158 +0,0 @@
-[comment]Copyright (c) 2008, 2012 Obeo.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8/]
-[module GenFacade('http://www.eclipse.org/emf/2002/Ecore', 'http://www.eclipse.org/emf/2002/GenModel')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::model::buildproperties /]
-[import org::eclipse::emf::eef::codegen::ecore::model::AdapterFactoryClass /]
-[import org::eclipse::emf::eef::codegen::ecore::model::FactoryClass /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::PackageClass /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::Class /]
-[import org::eclipse::emf::eef::codegen::ecore::model::EnumClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
-[import org::eclipse::emf::eef::codegen::ecore::model::manifest /]
-[import org::eclipse::emf::eef::codegen::ecore::model::module_gwt_xml /]
-[import org::eclipse::emf::eef::codegen::ecore::model::Plugin /]
-[import org::eclipse::emf::eef::codegen::ecore::model::plugin_properties /]
-[import org::eclipse::emf::eef::codegen::ecore::model::plugin_xml /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::ResourceClass /]
-[import org::eclipse::emf::eef::codegen::ecore::model::ResourceFactoryClass /]
-[import org::eclipse::emf::eef::codegen::ecore::model::SwitchClass /]
-[import org::eclipse::emf::eef::codegen::ecore::model::ValidatorClass /]
-[import org::eclipse::emf::eef::codegen::ecore::model::XmlProcessorClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::fileUtil /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::WrapperClass /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::LoaderClass /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::AbstractRepresentingClass /]
-[import org::eclipse::papyrus::facade::codegen::genfacade::RepresentingElementAdapter /]
-[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
-
-
-[**
- * Generates all the classes of the Model plug-in from a genModel.
- * 
- * WARNING: The genModel passed to this template MUST be loaded and reconciled as in 
- * org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil.loadGenModels()
- * Otherwise canGenerate() will always return false, and invalid reference in the GenModel will cause problems.
- * In order to prevent a reference to an Ecore UI plug-in, this is done in the eef ui plug-in.
- * 
-*/]
-[template public GenAllGenClass(genModel : GenModel) ? (genModel.canGenerate())]
-	[comment @main /]
-	[if (not genModel.fileExistsModel(genModel.buildPropertiesFilePath()))]
-		[genModel.buildProperties()/]
-	[/if]
-
-	[comment from EMF codegen : Do allow an existing MANIFEST.MF to be overwritten, since it may have been created as part of an empty EMF project.
-        Use the existence of a plugin.xml as a guard against overwriting in a project that has already been generated. /]
-	[if (not genModel.fileExistsModel(genModel.pluginXmlFilePath()))]
-		[genModel.manifest()/]
-	[/if]
-
-	[comment @TODO See when and where GWT files are generated/]
-	[comment][genModel.moduleGwt()/][/comment]
-
-	[if (genModel.hasModelPluginClass())]
-		[genModel.plugin()/]
-	[/if]
-
-	[if (genModel.hasPluginSupport())]
-		[if (not genModel.sameModelEditProject() and not genModel.sameModelEditorProject())]
-			[if (genModel.bundleManifest and not genModel.fileExistsModel(genModel.manifestFilePath()))]
-				[genModel.manifest()/]
-			[/if]
-	
-			[if (not genModel.fileExistsModel(genModel.pluginXmlFilePath()))]
-				[genModel.pluginXml()/]
-			[/if]
-		[/if]
-	
-		[if (not genModel.fileExistsModel(genModel.pluginPropertiesFilePath()))]
-			[genModel.pluginProperties()/]
-		[/if]
-	
-		[if (not genModel.fileExistsModel(genModel.buildPropertiesFilePath()))]
-			[genModel.buildProperties()/]
-		[/if]
-	[/if]
-
-	[for (p : GenPackage | genModel.eAllContents(GenPackage))]
-		[if (p.canGenerate())]
-			[p.prepareCache()/][comment Create helpers to cache and supply information for unique naming./]
-
-			[copyEcore(p)/]
-
-			[initUtilsCaches()/]
-	
-			[for (genClass : GenClass | p.genClasses)]
-				[if (genClass.canGenerate())]
-					[if (not genClass.isExternalInterface() and (not genModel.suppressInterfaces or genClass.isInterface()))]
-						[genClass.genGenClass(true, false)/]
-					[/if]
-					[if (not genClass.isInterface())]
-						[genClass.genGenClass(if genModel.suppressInterfaces then true else false endif, true)/]
-					[/if]
-				[/if]
-			[/for]
-			[for (genEnum : GenEnum | p.genEnums)]
-				[if (genEnum.canGenerate())]
-					[genEnum.enumClass()/]
-				[/if]
-			[/for]
-	
-			[if (p.hasClassifiers())]
-	
-
-	
-				[if (not genModel.suppressEMFMetaData and not genModel.suppressInterfaces)]
-					[p.packageClass(true, false)/]
-				[/if]
-		
-				[p.packageClass(if genModel.suppressEMFMetaData or genModel.suppressInterfaces then true else false endif, true)/]
-		
-				[if (not genModel.suppressInterfaces)]
-					[p.factoryClass(true, false)/]
-				[/if]
-		
-				[p.factoryClass(if genModel.suppressInterfaces then true else false endif, true)/]
-		
-				[if (p.resource = GenResourceKind::XML)]
-					[p.xmlProcessorClass()/]
-				[/if]
-		
-				[comment][if (p.hasConstraints())]
-					[p.validatorClass()/]
-				[/if][/comment]
-		
-				[if (p.adapterFactory and p.genClasses->notEmpty())]
-					[p.switchClass()/]
-					[p.adapterFactoryClass()/]
-				[/if]
-			[/if]
-
-			[p.wrapperClass()/]
-			[p.loaderClass()/]
-			[p.abstractRepresentingClass()/]
-			[p.representingElementAdapterClass()/]
-
-		
-			[if (p.resource <> GenResourceKind::None)]
-				[p.resourceFactoryClass()/]
-				[p.resourceClass()/]
-			[/if]
-	
-			[p.clearCache()/]
-		[/if]
-	[/for]
-[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl
deleted file mode 100644
index 0be27c265bd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl
+++ /dev/null
@@ -1,128 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module LoaderClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-
-
-[template public loaderClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'Loader'} ]
-[genModel.initializeImportManager(packageName, className)/]
-
-[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
-
-[file (genPackage.loaderPath(className), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage.loaderFileContent(genModel, className)]
-[genModel.genSortedImports()/]
-[content/]
-[/let]
-[/file]
-[/template]
-
-[template protected loaderFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-
-public class Loader {
-
-	public static Resource doLoad(InputStream inputStream, Map<?, ?> options, EFactory inputFactory, Resource res) throws IOException {
-		//System.err.println("Load : " + res);
-
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		DocumentBuilder db;
-
-		// Open XML
-		try {
-			db = dbf.newDocumentBuilder();
-			Document document = db.parse(inputStream);
-			Element root = document.getDocumentElement();
-
-			if(root.getNodeName().equals("source")) {
-				String umlFileURIAtt = root.getAttribute("uri");
-				URI umlFileURI = URI.createURI(umlFileURIAtt);
-
-				ResourceSet resSetUML = new ResourceSetImpl();
-				Resource resUML = resSetUML.getResource(umlFileURI, true);
-				if(resUML != null) {
-
-					Iterator<EObject> content = resUML.getContents().iterator();
-					ArrayList internalEObjectList = new ArrayList<>();
-
-					while(content.hasNext()) {
-						EObject umlModelElement = (EObject)content.next();
-						if(umlModelElement instanceof org.eclipse.uml2.uml.Element) {
-							EObject representing = Wrapper.getInstance().findOrCreateSpecific((org.eclipse.uml2.uml.Element)umlModelElement);
-	
-							if(representing != null) {
-									internalEObjectList.add(representing);
-							}
-						}
-					}
-
-					InternalEList<InternalEObject> internalEObjects = (InternalEList<InternalEObject>)(InternalEList<?>)res.getContents();
-					internalEObjects.addAllUnique(internalEObjectList);
-
-					return resUML;
-				} else {
-					throw new UnsupportedOperationException();
-				}
-			}
-		} catch (ParserConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		return null;
-
-	}
-}
-
-
-[/template]
-
-[query public loaderPath(genPackage : GenPackage, className : String) : String
-	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
-		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl
deleted file mode 100644
index 0ccb37a9895..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl
+++ /dev/null
@@ -1,1289 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module PackageClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnumLiteral /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenTypeParameter /]
-[import org::eclipse::emf::eef::codegen::ecore::model::genpackage::EGenericType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::EAnnotation /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-
-[template public packageClass(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean)]
-[comment]
- /**
- * <copyright>
- *
- * Copyright (c) 2002-2010 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *
- * </copyright>
- */
-[/comment]
-[let genModel : GenModel = genPackage.genModel]
-[let packageName : String = genPackage.packageClassPackageName(isInterface)]
-[let className : String = genPackage.packageClassName(isImplementation)]
-
-[genModel.initializeImportManager(genPackage, packageName, className)/]
-
-[if (isImplementation)]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Registry')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Descriptor')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container.Dynamic')/]
-[if (genPackage.isLiteralsInterface())]
-	[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.Literals')/]
-[/if]
-[for (genClassifier : GenClassifier | genPackage.getOrderedGenClassifiers())]
-	[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.' + genPackage.getClassifierID(genClassifier))/]
-[/for]
-[/if]
-
-
-
-[file (packageClassPath(genPackage, isInterface, isImplementation), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage.packageClassFileContent(isInterface, isImplementation, genModel, className)]
-[genModel.genSortedImports()/]
-
-[content.trim()/]
-[/let]
-[/file]
-
-
-
-[/let][comment className /]
-[/let][comment packageName /]
-[/let][comment genModel /]
-[/template]
-
-[template protected packageClassFileContent(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean, genModel : GenModel, className : String)]
-[let publicStaticFinalFlag : String = if (isImplementation) then 'public static final ' else '' endif]
-[if (isImplementation)]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Registry')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Descriptor')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container')/]
-[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container.Dynamic')/]
-  [if (genPackage.isLiteralsInterface())]
-[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.Literals')/]
-  [/if]
-  [for (genClassifier : GenClassifier | genPackage.getOrderedGenClassifiers())]
-    [genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.' + genPackage.getClassifierID(genClassifier))/]
-  [/for]
-[/if]
-[if (isInterface)]
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
-  [if (genModel.operationReflection)]
- *   <li>each operation of each class,</li>
-  [/if]
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
-  [if (genPackage.hasDocumentation())]
- * <!-- begin-model-doc -->
- * [genPackage.getDocumentation(genModel.getIndentation())/]
- * <!-- end-model-doc -->
-  [/if]
- * @see [genPackage.getQualifiedFactoryInterfaceName()/]
-  [if (not genModel.suppressEMFModelTags)]
-    [let modelInfoLines : Sequence(String) = genPackage.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
-      [if (modelInfoLines->isEmpty())]
- * @model
-      [else]
- * @model [modelInfoLines->sep(genModel.getLineDelimiter() + ' *        ')/]
-      [/if]
-    [/let]
-  [/if]
- * @generated
- */
-[else][comment isInterface /]
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-[/if][comment isInterface /]
-[if (isImplementation)]
-public class [className/] extends [genModel.getImportedName('org.eclipse.emf.ecore.impl.EPackageImpl')/][if (not isInterface)] implements [genPackage.getImportedPackageInterfaceName()/][/if] {
-[else]
-public interface [className/] extends [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/] {
-[/if]
-[if (genModel.hasCopyrightField())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
-
-[/if]
-[if (isInterface)]
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNAME = "[genPackage.getPackageName()/]";[genModel.getNonNLS()/]
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNS_URI = "[genPackage.getNSURI()/]";[genModel.getNonNLS()/]
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNS_PREFIX = "[genPackage.getNSName()/]";[genModel.getNonNLS()/]
-  [if (genPackage.isContentType())]
-
-	/**
-	 * The package content type ID.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eCONTENT_TYPE = "[genPackage.contentTypeIdentifier/]";[genModel.getNonNLS()/]
-  [/if]
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[publicStaticFinalFlag/][genPackage.getPackageInterfaceName()/] eINSTANCE = [genPackage.getQualifiedPackageClassName()/].init();
-
-  [for (genClassifier : GenClassifier  | genPackage.getOrderedGenClassifiers())]
-	/**
-    [if (genClassifier.oclIsKindOf(GenClass))]
-      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-        [if (not genClass.isInterface())]
-	 * The meta object id for the '{@link [genClass.getQualifiedClassName()/] <em>[genClass.getFormattedName()/]</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see [genClass.getQualifiedClassName()/]
-        [else]
-	 * The meta object id for the '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see [genClass.getQualifiedInterfaceName()/]
-        [/if]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenEnum))]
-      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
-	 * The meta object id for the '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see [genEnum.getQualifiedName()/]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenDataType))]
-      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
-	 * The meta object id for the '<em>[genDataType.getFormattedName()/]</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
-	 * @see [genDataType.getRawInstanceClassName()/]
-        [/if]
-      [/let]
-    [/if][/if][/if]
-	 * @see [genPackage.getQualifiedPackageClassName()/]#get[genClassifier.getClassifierAccessorName()/]()
-	 * @generated
-	 */
-	[publicStaticFinalFlag/]int [genPackage.getClassifierID(genClassifier)/] = [genPackage.getClassifierValue(genClassifier)/];
-
-    [if (genClassifier.oclIsKindOf(GenClass))]
-      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-        [for (genFeature : GenFeature | genClass.getAllGenFeatures())]
-	/**
-	 * The feature id for the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/].
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	[publicStaticFinalFlag/]int [genClass.getFeatureID(genFeature)/] = [genClass.getFeatureValue(genFeature)/];
-
-        [/for]
-	/**
-	 * The number of structural features of the '<em>[genClass.getFormattedName()/]</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	[publicStaticFinalFlag/]int [genClass.getFeatureCountID()/] = [genClass.getFeatureCountValue()/];
-
-        [if (genModel.operationReflection)]
-          [for (genOperation : GenOperation | genClass.getAllGenOperations(false))]
-            [if (genClass.getOverrideGenOperation(genOperation) = null)]
-	/**
-	 * The operation id for the '<em>[genOperation.getFormattedName()/]</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	[publicStaticFinalFlag/]int [genClass.getOperationID(genOperation, false)/] = [genClass.getOperationValue(genOperation)/];
-
-            [/if]
-          [/for]
-	/**
-	 * The number of operations of the '<em>[genClass.getFormattedName()/]</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	[publicStaticFinalFlag/]int [genClass.getOperationCountID()/] = [genClass.getOperationCountValue()/];
-
-        [/if]
-      [/let]
-    [/if]
-  [/for]
-[/if]
-[if (isImplementation)]
-  [if (genPackage.isLoadingInitialization())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected String packageFilename = "[genPackage.getSerializedPackageFilename()/]";[genModel.getNonNLS()/]
-
-  [/if]
-  [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private [genClassifier.getImportedMetaType()/] [genClassifier.getClassifierInstanceName()/] = null;
-
-  [/for]
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see [genPackage.getQualifiedPackageInterfaceName()/]#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private [genPackage.getPackageClassName()/]() {
-		super(eNS_URI, [genPackage.getQualifiedEFactoryInstanceAccessor()/]);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link [genPackage.getImportedPackageInterfaceName()/]#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-  [if (not genPackage.isLoadedInitialization())]
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-  [/if]
-	 * @generated
-	 */
-	public static [genPackage.getImportedPackageInterfaceName()/] init() {
-		if (isInited) return ([genPackage.getImportedPackageInterfaceName()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([genPackage.getImportedPackageInterfaceName()/].eNS_URI);
-
-  [if (genModel.runtimePlatform = GenRuntimePlatform::GWT)]
-		initializeRegistryHelpers();
-
-  [/if]
-		// Obtain or create and register package
-		[genPackage.getPackageClassName()/] the[genPackage.getBasicPackageName()/] = ([genPackage.getPackageClassName()/])([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.get(eNS_URI) instanceof [genPackage.getPackageClassName()/] ? [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.get(eNS_URI) : new [genPackage.getPackageClassName()/]());
-
-		isInited = true;
-
-  [if (genPackage.getPackageSimpleDependencies()->notEmpty())]
-		// Initialize simple dependencies
-    [for (dep : GenPackage | genPackage.getPackageSimpleDependencies())]
-		[dep.getImportedPackageInterfaceName()/].eINSTANCE.eClass();
-    [/for]
-
-  [/if]
-  [if (genPackage.getPackageInterDependencies()->notEmpty())]
-		// Obtain or create and register interdependencies
-    [for (interdep : GenPackage | genPackage.getPackageInterDependencies())]
-		[interdep.getImportedPackageClassName()/] [genPackage.getPackageInstanceVariable(interdep)/] = ([interdep.getImportedPackageClassName()/])([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([interdep.getImportedPackageInterfaceName()/].eNS_URI) instanceof [interdep.getImportedPackageClassName()/] ? [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([interdep.getImportedPackageInterfaceName()/].eNS_URI) : [interdep.getImportedPackageInterfaceName()/].eINSTANCE);
-    [/for]
-
-  [/if]
-  [if (genPackage.isLoadedInitialization() or genPackage.getPackageLoadInterDependencies()->notEmpty())]
-		// Load packages
-    [if (genPackage.isLoadingInitialization())]
-		the[genPackage.getBasicPackageName()/].loadPackage();
-    [/if]
-    [for (interdep : GenPackage | genPackage.getPackageLoadInterDependencies())]
-      [if (interdep.isLoadingInitialization())]
-		[genPackage.getPackageInstanceVariable(interdep)/].loadPackage();
-      [/if]
-    [/for]
-
-  [/if]
-  [if (not genPackage.isLoadedInitialization() or genPackage.getPackageBuildInterDependencies()->notEmpty())]
-		// Create package meta-data objects
-    [if (not genPackage.isLoadedInitialization())]
-		the[genPackage.getBasicPackageName()/].createPackageContents();
-    [/if]
-    [for (interdep : GenPackage | genPackage.getPackageBuildInterDependencies())]
-		[genPackage.getPackageInstanceVariable(interdep)/].createPackageContents();
-    [/for]
-
-		// Initialize created meta-data
-    [if (not genPackage.isLoadedInitialization())]
-		the[genPackage.getBasicPackageName()/].initializePackageContents();
-    [/if]
-    [for (interdep : GenPackage | genPackage.getPackageBuildInterDependencies())]
-		[genPackage.getPackageInstanceVariable(interdep)/].initializePackageContents();
-    [/for]
-
-  [/if]
-  [if (genPackage.isLoadedInitialization() or genPackage.getPackageLoadInterDependencies()->notEmpty())]
-		// Fix loaded packages
-    [if (genPackage.isLoadedInitialization())]
-		the[genPackage.getBasicPackageName()/].fixPackageContents();
-    [/if]
-    [for (interdep : GenPackage | genPackage.getPackageLoadInterDependencies())]
-		[genPackage.getPackageInstanceVariable(interdep)/].fixPackageContents();
-    [/for]
-
-  [/if]
-  [comment][if (genPackage.hasConstraints())]
-		// Register package validator
-		[genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/].Registry.INSTANCE.put
-			(the[genPackage.getBasicPackageName()/], 
-			 new [genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/].Descriptor()
-			 {
-				 public [genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/] getEValidator()
-				 {
-					 return [genPackage.getImportedValidatorClassName()/].INSTANCE;
-				 }
-			 });
-
-  [/if][/comment]
-  [if (not genPackage.isEcorePackage())]
-		// Mark meta-data to indicate it can't be changed
-		the[genPackage.getBasicPackageName()/].freeze();
-
-  [/if]
-  
-		// Update the registry and return the package
-		[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.put([genPackage.getImportedPackageInterfaceName()/].eNS_URI, the[genPackage.getBasicPackageName()/]);
-		return the[genPackage.getBasicPackageName()/];
-	}
-  [if (genModel.runtimePlatform = GenRuntimePlatform::GWT)]
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void initializeRegistryHelpers() {
-    [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-      [if (genClassifier.oclIsKindOf(GenClass))]
-        [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-          [if (not genClass.dynamic)]
-		[genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].register
-			([if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][/if].class, 
-			 new [genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].Helper() 
-			 {
-				 public boolean isInstance(Object instance)
-				 {
-					 return instance instanceof [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][genClass.getInterfaceWildTypeArguments()/][/if];
-				 }
-
-				 public Object newArrayInstance(int size)
-				 {
-					 return new [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][/if]['[size]'/];
-				 }
-			 });
-          [/if]
-        [/let]
-      [else][if (genClassifier.oclIsKindOf(GenDataType))]
-        [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
-          [if (not genDataType.isPrimitiveType() and not genDataType.isObjectType())]
-		[genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].register
-			([genDataType.getRawImportedInstanceClassName()/].class, 
-			 new [genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].Helper() {
-				 public boolean isInstance(Object instance) {
-					 return instance instanceof [genDataType.getImportedWildcardInstanceClassName()/];
-				 }
-
-				 public Object newArrayInstance(int size) {
-            [if (genDataType.isArrayType())]
-              [let componentType :String = genDataType.getRawImportedInstanceClassName().replaceAll('(?:\\[\\])+$', '')]
-                [let indices : String = genDataType.getRawImportedInstanceClassName().replaceAll('.*(?:\\[\\])+$', '$1')]
-					 return new [componentType/]['[size]'/][indices/];
-                [/let]
-              [/let]
-            [else]
-					 return new [genDataType.getRawImportedInstanceClassName()/]['[size]'/];
-            [/if]
-				 }
-		});
-          [/if]
-        [/let]
-      [/if][/if]
-    [/for]
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class WhiteList implements [genModel.getImportedName('com.google.gwt.user.client.rpc.IsSerializable')/], EBasicWhiteList {
-    [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-      [if (genClassifier.oclIsKindOf(GenClass))]
-        [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-          [if (not genClass.dynamic)]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getImportedWildcardInstanceClassName()/][/if] [genClass.getSafeUncapName()/];
-
-          [/if]
-        [/let]
-      [else][if (genClassifier.oclIsKindOf(GenDataType))]
-        [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
-          [if (not genDataType.isObjectType() and genDataType.isSerializable())]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected [genDataType.getImportedWildcardInstanceClassName()/] [genDataType.getSafeUncapName()/];
-
-          [/if]
-        [/let]
-      [/if][/if]
-    [/for]
-	}
-  [/if]
-
-[/if]
-[if (isInterface)][comment TODO REMOVE THIS BOGUS EMPTY LINE /]
-
-[/if]
-[for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-  [if (isInterface)]
-	/**
-    [if (genClassifier.oclIsKindOf(GenClass))]
-      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-	 * Returns the meta object for class '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>[genClass.getFormattedName()/]</em>'.
-	 * @see [genClass.getQualifiedInterfaceName()/]
-        [if (not genModel.suppressEMFModelTags and (genClass.isExternalInterface() or genClass.dynamic))]
-          [let modelInfoLines : Sequence(String) = genClass.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
-            [if (modelInfoLines->isEmpty())]
-	 * @model
-            [else]
-	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
-            [/if]
-          [/let]
-        [/if]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenEnum))]
-      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
-	 * Returns the meta object for enum '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>[genEnum.getFormattedName()/]</em>'.
-	 * @see [genEnum.getQualifiedName()/]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenDataType))]
-      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
-        [if (genDataType.isPrimitiveType() or genDataType.isArrayType())]
-	 * Returns the meta object for data type '<em>[genDataType.getFormattedName()/]</em>'.
-        [else]
-	 * Returns the meta object for data type '{@link [genDataType.getRawInstanceClassName()/] <em>[genDataType.getFormattedName()/]</em>}'.
-        [/if]
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>[genDataType.getFormattedName()/]</em>'.
-        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
-	 * @see [genDataType.getRawInstanceClassName()/]
-        [/if]
-        [if (not genModel.suppressEMFModelTags)]
-          [let modelInfoLines : Sequence(String) = genDataType.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
-            [if (modelInfoLines->isEmpty())]
-	 * @model
-            [else]
-	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
-            [/if]
-          [/let]
-        [/if]
-      [/let]
-    [/if][/if][/if]
-	 * @generated
-	 */
-  [else]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [/if]
-  [if (isImplementation)]
-	public [genClassifier.getImportedMetaType()/] get[genClassifier.getClassifierAccessorName()/]() {
-    [if (genPackage.isLoadedInitialization())]
-		if ([genClassifier.getClassifierInstanceName()/] == null) {
-			[genClassifier.getClassifierInstanceName()/] = ([genClassifier.getImportedMetaType()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([genPackage.getImportedPackageInterfaceName()/].eNS_URI).getEClassifiers().get([genPackage.getLocalClassifierIndex(genClassifier)/]);
-		}
-    [/if]
-		return [genClassifier.getClassifierInstanceName()/];
-	}
-
-  [else]
-	[genClassifier.getImportedMetaType()/] get[genClassifier.getClassifierAccessorName()/]();
-
-  [/if]
-  [if (genClassifier.oclIsKindOf(GenClass))]
-    [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-      [for (genFeature : GenFeature | genClass.genFeatures)]
-        [if (isInterface)]
-	/**
-	 * Returns the meta object for the [genFeature.getFeatureKind()/] '{@link [genClass.getQualifiedInterfaceName()/][if (not genClass.isMapEntry() and not genFeature.isSuppressedGetVisibility())]#[genFeature.getGetAccessor()/][/if] <em>[genFeature.getFormattedName()/]</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the [genFeature.getFeatureKind()/] '<em>[genFeature.getFormattedName()/]</em>'.
-	 * @see [genClass.getQualifiedInterfaceName()/][if (not genClass.isMapEntry() and not genFeature.isSuppressedGetVisibility())]#[genFeature.getGetAccessor()/]()[/if]
-	 * @see #get[genClass.getClassifierAccessorName()/]()
-	 * @generated
-	 */
-        [else]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-        [/if]
-        [if (isImplementation)]
-	public [genFeature.getImportedMetaType()/] get[genFeature.getFeatureAccessorName()/]() {
-          [if (not genPackage.isLoadedInitialization())]
-		return ([genFeature.getImportedMetaType()/])[genClass.getClassifierInstanceName()/].getEStructuralFeatures().get([genClass.getLocalFeatureIndex(genFeature)/]);
-          [else]
-        return ([genFeature.getImportedMetaType()/])get[genClassifier.getClassifierAccessorName()/]().getEStructuralFeatures().get([genClass.getLocalFeatureIndex(genFeature)/]);
-          [/if]
-	}
-        [else]
-	[genFeature.getImportedMetaType()/] get[genFeature.getFeatureAccessorName()/]();
-        [/if]
-
-      [/for]
-      [if (genModel.operationReflection)]
-        [for (genOperation : GenOperation | genClass.genOperations)]
-          [if (isInterface)]
-	/**
-	 * Returns the meta object for the '{@link [genClass.getQualifiedInterfaceName()/]#[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>[genOperation.getFormattedName()/]</em>' operation.
-	 * @see [genClass.getQualifiedInterfaceName()/]#[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
-	 * @generated
-	 */
-          [else]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-          [/if]
-          [if (isImplementation)]
-	public [genOperation.getImportedMetaType()/] get[genOperation.getOperationAccessorName()/]() {
-            [if (not genPackage.isLoadedInitialization())]
-		return [genClass.getClassifierInstanceName()/].getEOperations().get([genClass.getLocalOperationIndex(genOperation)/]);
-            [else]
-        return get[genClassifier.getClassifierAccessorName()/]().getEOperations().get([genClass.getLocalOperationIndex(genOperation)/]);
-            [/if]
-	}
-          [else]
-	[genOperation.getImportedMetaType()/] get[genOperation.getOperationAccessorName()/]();
-          [/if]
-
-        [/for]
-      [/if]
-    [/let]
-  [/if]
-[/for]
-[if (isInterface)]
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-[else]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-[/if]
-[if (isImplementation)]
-	public [genPackage.getImportedFactoryInterfaceName()/] get[genPackage.getFactoryName()/]() {
-		return ([genPackage.getImportedFactoryInterfaceName()/])getEFactoryInstance();
-	}
-[else]
-	[genPackage.getFactoryInterfaceName()/] get[genPackage.getFactoryName()/]();
-[/if]
-
-[if (isImplementation)]
-  [if (not genPackage.isLoadedInitialization())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-    [if (genPackage.genClasses->notEmpty())]
-		// Create classes and their features
-      [for (genClass : GenClass | genPackage.genClasses) separator (genModel.getLineDelimiter())]
-		[genClass.getClassifierInstanceName()/] = create[genClass.getMetaType()/]([genClass.getClassifierID()/]);
-        [for (genFeature : GenFeature | genClass.genFeatures)]
-		create[genFeature.getMetaType()/]([genClass.getClassifierInstanceName()/], [genClass.getFeatureID(genFeature)/]);
-        [/for]
-        [if (genModel.operationReflection)]
-          [for (genOperation : GenOperation | genClass.genOperations)]
-		createEOperation([genClass.getClassifierInstanceName()/], [genClass.getOperationID(genOperation, false)/]);
-          [/for]
-        [/if]
-      [/for]
-    [/if]
-    [if (genPackage.genEnums->notEmpty())]
-
-		// Create enums
-      [for (genEnum : GenEnum | genPackage.genEnums)]
-		[genEnum.getClassifierInstanceName()/] = createEEnum([genEnum.getClassifierID()/]);
-      [/for]
-    [/if]
-    [if (genPackage.genDataTypes->notEmpty())]
-
-		// Create data types
-      [for (genDataType : GenDataType | genPackage.genDataTypes)]
-		[genDataType.getClassifierInstanceName()/] = createEDataType([genDataType.getClassifierID()/]);
-      [/for]
-    [/if]
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-    [if (genPackage.getPackageInitializationDependencies()->notEmpty())]
-
-		// Obtain other dependent packages
-      [for (dep : GenPackage | genPackage.getPackageInitializationDependencies())]
-		[dep.getImportedPackageInterfaceName()/] [genPackage.getPackageInstanceVariable(dep)/] = ([dep.getImportedPackageInterfaceName()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([dep.getImportedPackageInterfaceName()/].eNS_URI);
-      [/for]
-    [/if]
-    [if (genPackage.getSubGenPackages()->notEmpty())]
-
-		// Add subpackages
-      [for (sub : GenPackage | genPackage.getSubGenPackages())]
-		getESubpackages().add([genPackage.getPackageInstanceVariable(sub)/]);
-      [/for]
-    [/if]
-    [if (genPackage.genClasses->notEmpty())]
-     [comment { boolean firstOperationAssignment = true; int maxTypeParameterAssignment = 0;/]
-      [if (genModel.useGenerics())]
-
-		// Create type parameters
-        [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-          [for (genTypeParameter : GenTypeParameter | genClassifier.genTypeParameters)]
-            [if (genTypeParameter.ecoreTypeParameter.eBounds->notEmpty() or genTypeParameter.isUsed())]
-		[genModel.getImportedName('org.eclipse.emf.ecore.ETypeParameter')/] [genClassifier.getClassifierInstanceName()/]_[genTypeParameter.getName()/] = addETypeParameter([genClassifier.getClassifierInstanceName()/], "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
-            [else]
-		addETypeParameter([genClassifier.getClassifierInstanceName()/], "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
-            [/if]
-          [/for]
-        [/for]
-      [/if]
-
-      [if (genModel.useGenerics())]
-
-		// Set bounds for type parameters[genPackage.resetMaxGenericTypeAssignment()/][genPackage.resetGenOperationPrefix()/]
-        [for (genClassifier : GenClassifier |genPackage.genClassifiers)]
-          [for (genTypeParameter : GenTypeParameter | genClassifier.genTypeParameters)]
-            [for (bound : EGenericType | genTypeParameter.ecoreTypeParameter.eBounds)]
-		[genPackage.prefix(0)/]g1 = createEGenericType([bound.type(genModel, genPackage)/]);
-              [for (eGenericType : EGenericType | bound.eAllContents(EGenericType))]
-              [comment]<%for (InformationIterator i=new InformationIterator(bound); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
-		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-              [/for]
-		[genClassifier.getClassifierInstanceName()/]_[genTypeParameter.getName()/].getEBounds().add(g1);
-            [/for]
-          [/for]
-        [/for]
-      [/if]
-
-		// Add supertypes to classes
-      [for (genClass : GenClass | genPackage.genClasses)]
-        [if (not genClass.hasGenericSuperTypes())]
-          [for (baseGenClass : GenClass | genClass.getBaseGenClasses())]
-		[genClass.getClassifierInstanceName()/].getESuperTypes().add([genPackage.getPackageInstanceVariable(baseGenClass.genPackage)/].get[baseGenClass.getClassifierAccessorName()/]());
-          [/for]
-        [else]
-          [for (superType : EGenericType | genClass.ecoreClass.eGenericSuperTypes)]
-		[genPackage.prefix(0)/]g1 = createEGenericType([superType.type(genModel, genPackage)/]);
-            [for (eGenericType : EGenericType | superType.eAllContents(EGenericType))]
-            [comment]<%for (InformationIterator i=new InformationIterator(superType); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
-		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-            [/for]
-		[genClass.getClassifierInstanceName()/].getEGenericSuperTypes().add(g1);
-          [/for]
-        [/if]
-      [/for]
-
-		// Initialize classes[if (genModel.operationReflection)], features, and operations; add parameters[else] and features; add operations and parameters[/if]
-      [for (genClass : GenClass | genPackage.genClasses) separator(genModel.getLineDelimiter())]
-      [let hasInstanceTypeName : Boolean = genModel.useGenerics() and genClass.ecoreClass.instanceTypeName <> null and genClass.ecoreClass.instanceTypeName.contains('<')]
-		initEClass([genClass.getClassifierInstanceName()/], [if (genClass.dynamic)]null[else][genClass.getRawImportedInterfaceName()/].class[/if], "[genClass.getName()/]", [genClass.getAbstractFlag()/], [genClass.getInterfaceFlag()/], [genClass.getGeneratedInstanceClassFlag()/][if (hasInstanceTypeName)], "[genClass.ecoreClass.instanceTypeName/]"[/if]);[genModel.getNonNLS()/][if (hasInstanceTypeName)][genModel.getNonNLS(2)/][/if]
-        [for (genFeature : GenFeature |genClass.genFeatures)]
-          [if (genFeature.hasGenericType())]
-            [let genericType : EGenericType = genFeature.ecoreFeature.eGenericType] 
-		[genPackage.prefix(0)/]g1 = createEGenericType([genericType.type(genModel, genPackage)/]);
-            [for (eGenericType : EGenericType | genericType.eAllContents(EGenericType))]
-            [comment]<%for (InformationIterator i=new InformationIterator(genFeature.getEcoreFeature().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
-		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-            [/for]
-            [/let]
-          [/if]
-          [if (genFeature.isReferenceType())]
-            [let reverse : String = if (genFeature.getReverse() = null) then 'null' else genPackage.getPackageInstanceVariable(genFeature.getReverse().getGenPackage()) + '.get' + genFeature.getReverse().getFeatureAccessorName() + '()' endif]
-		initEReference(get[genFeature.getFeatureAccessorName()/](), [if (genFeature.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())/].get[genFeature.getTypeClassifierAccessorName()/]()[/if], [reverse/], "[genFeature.getName()/]", [genFeature.getDefaultValue()/], [genFeature.getLowerBound()/], [genFeature.getUpperBound()/], [genFeature.getContainerClass()/], [genFeature.getTransientFlag()/], [genFeature.getVolatileFlag()/], [genFeature.getChangeableFlag()/], [genFeature.getContainmentFlag()/], [genFeature.getResolveProxiesFlag()/], [genFeature.getUnsettableFlag()/], [genFeature.getUniqueFlag()/], [genFeature.getDerivedFlag()/], [genFeature.getOrderedFlag()/]);[genModel.getNonNLS()/][genModel.getNonNLS(genFeature.getDefaultValue(), 2)/]
-              [for (keyFeature : GenFeature |genFeature.getKeys())]
-		get[genFeature.getFeatureAccessorName()/]().getEKeys().add([genPackage.getPackageInstanceVariable(keyFeature.getGenPackage())/].get[keyFeature.getFeatureAccessorName()/]());
-              [/for]
-            [/let]
-          [else]
-		initEAttribute(get[genFeature.getFeatureAccessorName()/](), [if (genFeature.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())/].get[genFeature.getTypeClassifierAccessorName()/]()[/if], "[genFeature.getName()/]", [genFeature.getDefaultValue()/], [genFeature.getLowerBound()/], [genFeature.getUpperBound()/], [genFeature.getContainerClass()/], [genFeature.getTransientFlag()/], [genFeature.getVolatileFlag()/], [genFeature.getChangeableFlag()/], [genFeature.getUnsettableFlag()/], [genFeature.getIDFlag()/], [genFeature.getUniqueFlag()/], [genFeature.getDerivedFlag()/], [genFeature.getOrderedFlag()/]);[genModel.getNonNLS()/][genModel.getNonNLS(genFeature.getDefaultValue(), 2)/]
-          [/if]
-        [/for]
-        [for (genOperation : GenOperation | genClass.genOperations)]
-
-          [if (genModel.useGenerics())]
-		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [if (genOperation.isVoid() or genOperation.hasGenericType())]null[else][genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/]()[/if], "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/], [genOperation.getUniqueFlag()/], [genOperation.getOrderedFlag()/]);[genModel.getNonNLS()/]
-          [else][if (not genOperation.isVoid())]
-            [if (not genOperation.ecoreOperation.ordered or not genOperation.ecoreOperation.unique)]
-		[genPackage.requireAddEOperation()/][genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/](), "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/], [genOperation.getUniqueFlag()/], [genOperation.getOrderedFlag()/]);[genModel.getNonNLS()/]
-            [else]
-		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/](), "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/]);[genModel.getNonNLS()/]
-            [/if]
-          [else]
-		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], null, "[genOperation.getName()/]");[genModel.getNonNLS()/]
-          [/if][/if]
-          [if (genModel.useGenerics())]
-            [for (genTypeParameter : GenTypeParameter | genOperation.genTypeParameters)][comment @TODO remove let typeParameterVariable /]
-              [let typeParameterVariable : String =
-                if (genTypeParameter.ecoreTypeParameter.eBounds->notEmpty() or genTypeParameter.isUsed()) then
-                  if (i = 1) then
-                    genModel.getImportedName('org.eclipse.emf.ecore.ETypeParameter') + ' t' + i + ' = '
-                  else
-                    't' + i + ' = '
-                  endif
-                else
-                  ''
-                endif
-              ]
-            [comment for (ListIterator<GenTypeParameter> t=genOperation.getGenTypeParameters().listIterator(); t.hasNext(); ) {
-	GenTypeParameter genTypeParameter = t.next();
-	String typeParameterVariable = "";
-	if (genTypeParameter.getEcoreTypeParameter().getEBounds()->notEmpty() || genTypeParameter.isUsed()) {
-		if (maxTypeParameterAssignment <= t.previousIndex()) {
-			++maxTypeParameterAssignment;
-			typeParameterVariable = genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter") + " t" + t.nextIndex() + " = ";
-		} else {
-			typeParameterVariable = "t" + t.nextIndex() + " = ";
-		}
-	} /]
-		[typeParameterVariable/]addETypeParameter(op, "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
-              [for (typeParameter : EGenericType | genTypeParameter.ecoreTypeParameter.eBounds)]
-[comment <%for (InformationIterator i=new InformationIterator(typeParameter); i.hasNext(); ) {
-  Information info = i.next(); String typePrefix = "";
-  if (maxGenericTypeAssignment <= eGenericType.depth()) {
-    ++maxGenericTypeAssignment;
-    typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " ";
-  }%>/]
-                [for (eGenericType : EGenericType | Sequence{typeParameter}->union(typeParameter.eAllContents(EGenericType)))]
-		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-                  [if (eGenericType.depth() > 0)]
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-                  [/if]
-                [/for]
-		t[i + 1/].getEBounds().add(g1);
-              [/for]
-              [/let]
-            [/for]
-          [/if]
-          [for (genParameter : GenParameter | genOperation.genParameters)]
-            [if (genParameter.hasGenericType())]
-              [for (eGenericType : EGenericType | genParameter.ecoreParameter.eAllContents(EGenericType))]
-              [comment <%for (InformationIterator i=new InformationIterator(genParameter.getEcoreParameter().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>/]
-		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-                [if (eGenericType.depth() > 0)]
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-                [/if]
-              [/for]
-            [/if]
-            [if (genModel.useGenerics())]
-		addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/], [genParameter.getUniqueFlag()/], [genParameter.getOrderedFlag()/]);[genModel.getNonNLS()/]
-            [else][if (not genParameter.ecoreParameter.ordered or not genParameter.ecoreParameter.unique)]
-		[genPackage.requireAddEParameter()/]addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/], [genParameter.getUniqueFlag()/], [genParameter.getOrderedFlag()/]);[genModel.getNonNLS()/]
-            [else]
-		addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/]);[genModel.getNonNLS()/]
-            [/if][/if]
-          [/for]
-          [if (genOperation.hasGenericExceptions())]
-              [for (genericExceptions : EGenericType | genOperation.ecoreOperation.eGenericExceptions)]
-                [for (eGenericType : EGenericType | genericExceptions.eAllContents(EGenericType)->flatten())]
-                [comment <%for (InformationIterator i=new InformationIterator(genericExceptions); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>/]
-		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-                  [if (eGenericType.depth() > 0)]
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-                  [/if]
-		addEException(op, g[eGenericType.depth() + 1/]);
-                [/for]
-              [/for]
-          [else]
-            [for (genException : GenClassifier | genOperation.getGenExceptions())]
-		addEException(op, [genPackage.getPackageInstanceVariable(genException.genPackage)/].get[genException.getClassifierAccessorName()/]());
-            [/for]
-          [/if]
-          [if (not genOperation.isVoid() and genOperation.hasGenericType())]
-            [for (eGenericType : EGenericType | Sequence{genOperation.ecoreOperation.eGenericType}->union(genOperation.ecoreOperation.eGenericType.eAllContents(EGenericType)))]
-            [comment]<%for (InformationIterator i=new InformationIterator(genOperation.getEcoreOperation().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
-		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
-              [if (eGenericType.depth() > 0)]
-		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
-              [/if]
-            [/for]
-		initEOperation(op, g1);
-          [/if]
-        [/for][comment genOperation/]
-      [/let]
-      [/for]
-    [/if]
-    [if (genPackage.genEnums->notEmpty())]
-
-		// Initialize enums and add enum literals
-      [for (genEnum : GenEnum | genPackage.genEnums) separator(genModel.getLineDelimiter())]
-		initEEnum([genEnum.getClassifierInstanceName()/], [genModel.getImportedName(genEnum.getQualifiedName())/].class, "[genEnum.getName()/]");[genModel.getNonNLS()/]
-        [for (genEnumLiteral : GenEnumLiteral |genEnum.genEnumLiterals)]
-		addEEnumLiteral([genEnum.getClassifierInstanceName()/], [if (genModel.getImportedName(genEnum.getQualifiedName()) = genEnum.getClassifierID())][genEnum.getQualifiedName()/][else][genModel.getImportedName(genEnum.getQualifiedName())/][/if].[genEnumLiteral.getEnumLiteralInstanceConstantName()/]);
-        [/for]
-      [/for]
-    [/if]
-    [if (genPackage.genDataTypes->notEmpty())]
-
-		// Initialize data types
-      [for (genDataType : GenDataType | genPackage.genDataTypes)]
-        [let hasInstanceTypeName : Boolean = genModel.useGenerics() and genDataType.ecoreDataType.instanceTypeName <> null and genDataType.ecoreDataType.instanceTypeName.contains('<')]
-        initEDataType([genDataType.getClassifierInstanceName()/], [genDataType.getRawImportedInstanceClassName()/].class, "[genDataType.getName()/]", [genDataType.getSerializableFlag()/], [genDataType.getGeneratedInstanceClassFlag()/][if (hasInstanceTypeName)], "[genDataType.ecoreDataType.instanceTypeName/]"[/if]);[genModel.getNonNLS()/][if (hasInstanceTypeName)][genModel.getNonNLS(2)/][/if]
-        [/let]
-      [/for]
-    [/if]
-    [if (genPackage.getSuperGenPackage() = null)]
-
-		// Create resource
-		createResource(eNS_URI);
-    [/if]
-    [if (not genPackage.isEcorePackage() and genPackage.getAnnotationSources()->notEmpty())]
-
-		// Create annotations
-      [for (annotationSource : String |genPackage.getAnnotationSources())]
-		// [annotationSource/]
-		create[genPackage.getAnnotationSourceIdentifier(annotationSource)/]Annotations();
-      [/for]
-    [/if]
-	}
-
-    [for (annotationSource : String | genPackage.getAnnotationSources())]
-	/**
-	 * Initializes the annotations for <b>[annotationSource/]</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void create[genPackage.getAnnotationSourceIdentifier(annotationSource)/]Annotations() {
-		String source = [if (annotationSource = null)]null;[else]"[annotationSource/]";[genModel.getNonNLS()/][/if]
-      [for (eAnnotation : EAnnotation | genPackage.getAllAnnotations())]
-        [let annotationReferenceDataList : Sequence(Sequence(OclAny)) = eAnnotation.getReferenceData(genPackage)]
-        [comment] @TODO How? use collect(some transformation) on annotationSource creation
-[if (annotationSource = null)][eAnnotation.source = null/][else][annotationSource = eAnnotation.source/][/if][/comment]
-		addAnnotation
-		  ([genPackage.getAnnotatedModelElementAccessor(eAnnotation)/], 
-		   source, 
-		   new String['[]'/] 
-		   {
-			 [eAnnotation.writeKeyValuePairs(genModel)/]
-		   }[if (eAnnotation.hasReferenceData(genPackage))]);[else],[/if]
-          [if (not eAnnotation.hasReferenceData(genPackage))]
-		   new [genModel.getImportedName('org.eclipse.emf.common.util.URI')/]['[]'/] 
-		   {
-            [for (annotationReferenceData : Sequence(OclAny) | annotationReferenceDataList) separator (',' + genModel.getNonNLS())]
-			 [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI([if (annotationReferenceData->at(1) <> genPackage)][annotationReferenceData->at(1).oclAsType(GenPackage).getImportedPackageInterfaceName()/].[/if]eNS_URI).appendFragment("[annotationReferenceData->at(2)/]")[/for][genModel.getNonNLS()/]
-		   });
-          [/if]
-        [for (nestedEAnnotation : EAnnotation | genPackage.getAllNestedAnnotations(eAnnotation))]
-          [let nestedAnnotationSource : String = nestedEAnnotation.source]
-            [let depth : Integer = nestedEAnnotation.depth()]
-              [let nestedAnnotationReferenceDataList : Sequence(Sequence(OclAny)) = nestedEAnnotation.getReferenceData(genPackage)]
-		addAnnotation
-		  ([genPackage.getAnnotatedModelElementAccessor(eAnnotation)/], 
-		   [depth/],
-		   [if (nestedAnnotationSource = null)]null,[else]"[nestedAnnotationSource/]",[genModel.getNonNLS()/][/if]
-		   new String['[]'/] 
-		   {
-			 [nestedEAnnotation.writeKeyValuePairs(genModel)/]
-		   }[if (nestedEAnnotation.hasReferenceData(genPackage))]);[else],[/if]
-          [if (not nestedEAnnotation.hasReferenceData(genPackage))]
-		   new [genModel.getImportedName('org.eclipse.emf.common.util.URI')/]['[]'/] 
-		   {
-            [for (annotationReferenceData : Sequence(OclAny) | nestedAnnotationReferenceDataList) separator (',' + genModel.getNonNLS())]
-			 [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI([if (annotationReferenceData->at(1) <> genPackage)][annotationReferenceData->at(1).oclAsType(GenPackage).getImportedPackageInterfaceName()/].[/if]eNS_URI).appendFragment("[annotationReferenceData->at(2)/]")[/for][genModel.getNonNLS()/]
-		   });
-          [/if]
-              [/let]
-            [/let]
-          [/let]
-        [/for]
-        [/let]
-      [/for]
-	}
-
-    [/for]
-  [else]
-    [if (genPackage.isLoadingInitialization())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isLoaded = false;
-
-	/**
-	 * Laods the package and any sub-packages from their serialized form.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void loadPackage() {
-		if (isLoaded) return;
-		isLoaded = true;
-
-		[genModel.getImportedName('java.net.URL')/] url = getClass().getResource(packageFilename);
-		if (url == null) {
-			throw new RuntimeException("Missing serialized package: " + packageFilename);[genModel.getNonNLS()/]
-		}
-		[genModel.getImportedName('org.eclipse.emf.common.util.URI')/] uri = [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI(url.toString());
-		[genModel.getImportedName('org.eclipse.emf.ecore.resource.Resource')/] resource = new [genModel.getImportedName('org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl')/]().createResource(uri);
-		try {
-			resource.load(null);
-		}
-		catch ([genModel.getImportedName('java.io.IOException')/] exception) {
-			throw new [genModel.getImportedName('org.eclipse.emf.common.util.WrappedException')/](exception);
-		}
-		initializeFromLoadedEPackage(this, ([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/])resource.getContents().get(0));
-		createResource(eNS_URI);
-	}
-
-    [/if]
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isFixed = false;
-
-	/**
-	 * Fixes up the loaded package, to make it appear as if it had been programmatically built.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fixPackageContents() {
-		if (isFixed) return;
-		isFixed = true;
-		fixEClassifiers();
-	}
-
-	/**
-	 * Sets the instance class on the given classifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-    [if (genModel.useClassOverrideAnnotation())]
-	@Override
-    [/if]
-	protected void fixInstanceClass([genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] eClassifier) {
-		if (eClassifier.getInstanceClassName() == null) {
-    [let dynamicGenClasses : OrderedSet(GenClass) = genPackage.genClasses->select(c : GenClass | c.dynamic)]
-      [if (dynamicGenClasses->isEmpty())]
-			eClassifier.setInstanceClassName("[genPackage.getInterfacePackageName()/]." + eClassifier.getName());[genModel.getNonNLS()/]
-			setGeneratedClassName(eClassifier);
-      [else]
-			switch (eClassifier.getClassifierID()) {
-        [for (genClass : GenClass | dynamicGenClasses)]
-          [if (genClass.dynamic)]
-				case [genPackage.getClassifierID(genClass)/]:
-          [/if]
-        [/for]
-				{
-					break;
-				}
-				default:
-				{
-					eClassifier.setInstanceClassName("[genPackage.getInterfacePackageName()/]." + eClassifier.getName());[genModel.getNonNLS()/]
-					setGeneratedClassName(eClassifier);
-					break;
-				}
-			}
-      [/if]
-    [/let]
-		}
-	}
-
-  [/if]
-  [if (needsAddEOperation())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected [genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] addEOperation([genModel.getImportedName('org.eclipse.emf.ecore.EClass')/] owner, [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered) {
-		[genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] o = addEOperation(owner, type, name, lowerBound, upperBound);
-		o.setUnique(isUnique);
-		o.setOrdered(isOrdered);
-		return o;
-	}
-	
-  [/if][comment needsAddEOperation /]
-  [if (needsAddEParameter())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected [genModel.getImportedName('org.eclipse.emf.ecore.EParameter')/] addEParameter([genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] owner, [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered) {
-		[genModel.getImportedName('org.eclipse.emf.ecore.EParameter')/] p = ecoreFactory.createEParameter();
-		p.setEType(type);
-		p.setName(name);
-		p.setLowerBound(lowerBound);
-		p.setUpperBound(upperBound);
-		p.setUnique(isUnique);
-		p.setOrdered(isOrdered);
-		owner.getEParameters().add(p);
-		return p;
-	}
-	
-  [/if][comment needsAddEParameter /]
-[/if][comment isImplementation) /]
-[if (isInterface and genPackage.isLiteralsInterface())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-  [if (genModel.operationReflection)]
-	 *   <li>each operation of each class,</li>
-  [/if]
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	[if (isImplementation)]public [/if]interface Literals {
-  [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
-		/**
-    [if (genClassifier.oclIsKindOf(GenClass))]
-      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-        [if (not genClass.isInterface())]
-		 * The meta object literal for the '{@link [genClass.getQualifiedClassName()/] <em>[genClass.getFormattedName()/]</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see [genClass.getQualifiedClassName()/]
-        [else]
-		 * The meta object literal for the '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see [genClass.getQualifiedInterfaceName()/]
-        [/if]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenEnum))]
-      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
-		 * The meta object literal for the '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see [genEnum.getQualifiedName()/]
-      [/let]
-    [else][if (genClassifier.oclIsKindOf(GenDataType))]
-      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
-		 * The meta object literal for the '<em>[genDataType.getFormattedName()/]</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
-		 * @see [genDataType.getRawInstanceClassName()/]
-        [/if]
-      [/let]
-    [/if][/if][/if]
-		 * @see [genPackage.getQualifiedPackageClassName()/]#get[genClassifier.getClassifierAccessorName()/]()
-		 * @generated
-		 */
-		[publicStaticFinalFlag/][genClassifier.getImportedMetaType()/] [genPackage.getClassifierID(genClassifier)/] = eINSTANCE.get[genClassifier.getClassifierAccessorName()/]();
-
-    [if (genClassifier.oclIsKindOf(GenClass))]
-      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
-        [for (genFeature : GenFeature |genClass.genFeatures)]
-		/**
-		 * The meta object literal for the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/] feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		[publicStaticFinalFlag/][genFeature.getImportedMetaType()/] [genClass.getFeatureID(genFeature)/] = eINSTANCE.get[genFeature.getFeatureAccessorName()/]();
-
-        [/for]
-        [if (genModel.operationReflection)]
-          [for (genOperation : GenOperation | genClass.genOperations)]
-		/**
-		 * The meta object literal for the '<em><b>[genOperation.getFormattedName()/]</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		[publicStaticFinalFlag/][genOperation.getImportedMetaType()/] [genClass.getOperationID(genOperation, false)/] = eINSTANCE.get[genOperation.getOperationAccessorName()/]();
-
-          [/for]
-        [/if]
-      [/let]
-    [/if]
-  [/for]
-	}
-
-[/if]
-} //[className/]
-[/let][comment publicStaticFinalFlag /]
-[/template]
-
-[query public packageClassPackageName(genPackage : GenPackage, isInterface : Boolean) : String =
-	if (isInterface and not genPackage.genModel.suppressInterfaces) then
-		genPackage.getReflectionPackageName()
-	else
-		genPackage.getClassPackageName()
-	endif
-/]
-
-[query public packageClassName(genPackage : GenPackage, isImplementation : Boolean) : String =
-	if (isImplementation) then
-		genPackage.getPackageClassName()
-	else
-		genPackage.getPackageInterfaceName()
-	endif
-/]
-
-[query public packageClassPath(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean) : String
-	= genPackage.genModel.modelPath(genPackage.packageClassPackageName(isInterface), genPackage.packageClassName(isImplementation)) /]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl
deleted file mode 100644
index f5be6ff5a8e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl
+++ /dev/null
@@ -1,106 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module RepresentingElementAdapter('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-
-
-[template public representingElementAdapterClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'RepresentingElementAdapter'} ]
-[genModel.initializeImportManager(packageName, className)/]
-
-[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
-
-[file (genPackage.representingElementAdapterClassPath(className), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage. representingElementAdapterFileContent(genModel, className)]
-[genModel.genSortedImports()/]
-[content/]
-[/let]
-[/file]
-[/template]
-
-[template protected representingElementAdapterFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.uml2.uml.Element;
-
-public class RepresentingElementAdapter extends AdapterImpl {
-
-	private EObject representingElement;
-
-	/**
-	 * Does nothing; clients may override so that it does something.
-	 */
-	public void notifyChanged(Notification msg) {
-
-		//Wrap notif
-		Object umlNotifier = msg.getNotifier();
-		EObject specificNotifier = Wrapper.getInstance().findOrCreateSpecific((EObject)umlNotifier);
-
-		Object umlFeature = msg.getFeature();
-		EStructuralFeature specificFeature = Wrapper.getInstance().getFeatureMappingFromUML((EStructuralFeature)umlFeature);
-
-		if(msg.getFeature() instanceof EReference) {
-			Object umlOld = msg.getOldValue();
-			EObject specificOld = null;
-			if(umlOld != null) {
-				specificOld = Wrapper.getInstance().findOrCreateSpecific((Element)umlOld);
-			}
-
-			Object umlNew = msg.getNewValue();
-			EObject specificNew = null;
-			if(umlNew != null) {
-				specificNew = Wrapper.getInstance().findOrCreateSpecific((Element)umlNew);
-			}
-
-			Notification notification = new ENotificationImpl((InternalEObject)specificNotifier, msg.getEventType(), specificFeature, specificOld, specificNew, msg.getPosition(), msg.wasSet());
-
-			specificNotifier.eNotify(notification);
-
-		} else {
-			Notification notification = new ENotificationImpl((InternalEObject)specificNotifier, msg.getEventType(), specificFeature, msg.getOldValue(), msg.getNewValue(), msg.getPosition(), msg.wasSet());
-
-			specificNotifier.eNotify(notification);
-		}
-		//System.err.println("UML Notif -> " + msg);
-	}
-
-
-	public EObject get__Representing() {
-		return representingElement;
-	}
-
-	public void set__Representing(EObject representing) {
-		representingElement = representing;
-	}
-}
-
-
-[/template]
-
-[query public representingElementAdapterClassPath(genPackage : GenPackage, className : String) : String
-	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
-		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl
deleted file mode 100644
index 5db46f61e88..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl
+++ /dev/null
@@ -1,536 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module ResourceClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-
-[comment]
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2006 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *
- * </copyright>
- */
-[/comment]
-
-[template public resourceClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = genPackage.getResourceClassName();} ]
-[genModel.initializeImportManager(packageName, className)/]
-
-[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
-
-[file (genPackage.resourceClassPath(), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage.resourceFileContent(genModel, className)]
-[genModel.genSortedImports()/]
-[content/]
-[/let]
-[/file]
-[/template]
-
-[template protected resourceFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see [genPackage.getQualifiedResourceFactoryClassName()/]
- * @generated
- */
-public class [className/] extends [genPackage.getImportedResourceBaseClassName()/]
-{
-	private [genModel.getImportedName('org.eclipse.emf.ecore.resource.Resource')/] resUML;
-
-	@Override
-	public void doLoad([genModel.getImportedName('java.io.InputStream')/] inputStream, [genModel.getImportedName('java.util.Map')/]<?, ?> options) throws [genModel.getImportedName('java.io.IOException')/] {
-		resUML = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Loader')/].doLoad(inputStream, options, [genModel.getImportedName(genPackage.getImportedFactoryInterfaceName())/].eINSTANCE, this);
-	}
-
-	@Override
-	public void doSave([genModel.getImportedName('java.io.OutputStream')/] outputStream, [genModel.getImportedName('java.util.Map')/]<?, ?> options) throws [genModel.getImportedName('java.io.IOException')/] {
-		if(resUML != null) {
-			resUML.save(options);
-		}
-		[genModel.getImportedName('java.io.PrintStream')/] stream = new [genModel.getImportedName('java.io.PrintStream')/](outputStream);
-		stream.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		String uri = resUML.getURI().toString();
-		stream.println("<source uri=\"" + uri + "\"/>");
-	}
-
-[if (genModel.hasCopyrightField())]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final [genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
-
-[/if]
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public [className/](URI uri)
-	{
-		super(uri);
-[if (genPackage.getResource() = GenResourceKind::XML)][comment Do nothing/]
-[/if]
-	}
-
-[if (genPackage.dataTypeConverters and (genPackage.hasDocumentRoot() or genPackage.isXMLTypePackage()))]
-[let _Map : String = if (genModel.useGenerics()) then 'Map<?, ?>' else 'Map' endif]
-[let _MapStringBoolean : String = if (genModel.useGenerics()) then 'Map<String, Boolean>' else 'Map' endif]
-[let _MapStringWildcard : String = if (genModel.useGenerics()) then 'Map<String, ?>' else 'Map' endif]
-[comment || org.eclipse.emf.ecore.xml.type.XMLTypePackage.eNS_URI.equals(genPackage.getNSURI()))) { boolean isXMLTypePackage = org.eclipse.emf.ecore.xml.type.XMLTypePackage.eNS_URI.equals(genPackage.getNSURI());%>/]
-	[if (not genPackage.isXMLTypePackage())]
-[genModel.getImportedName('org.eclipse.emf.ecore.xmi.XMLResource')/]
-[genModel.getImportedName('org.eclipse.emf.ecore.xmi.XMLParserPool')/]
-[genModel.getImportedName('org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl')/]
-[genModel.getImportedName('java.io.InputStream')/]
-[genModel.getImportedName('java.io.IOException')/]
-[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]
-[genModel.getImportedName('java.util.Collections')/]
-[genModel.getImportedName('java.util.HashMap')/]
-[genModel.getImportedName('java.util.Map')/]
-[genModel.getImportedName('org.xml.sax.InputSource')/]
-[genModel.getImportedName('javax.xml.parsers.SAXParser')/]
-	[/if]
-[genModel.getImportedName('org.xml.sax.Attributes')/]
-[genModel.getImportedName('org.xml.sax.SAXException')/]
-[let _StackFrame : String = genModel.getImportedName('org.eclipse.emf.ecore.xml.type.util.XMLTypeResourceImpl') + '.StackFrame']
-[let _DataFrame : String = genModel.getImportedName('org.eclipse.emf.ecore.xml.type.util.XMLTypeResourceImpl') + '.DataFrame']
-	[if (not genPackage.isXMLTypePackage())]
-	/**
-	 * A load option that turns of the use of the generate data converters.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String OPTION_USE_DATA_CONVERTER = "USE_DATA_CONVERTER";
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation())]
-	@Override
-  [/if]
-	public void doLoad(InputStream inputStream, [_Map/] options) throws IOException
-	{
-		if (options != null && Boolean.TRUE.equals(options.get(OPTION_USE_DATA_CONVERTER)))
-		{
-		  getContents().add
-			 (load
-				 (new InputSource(inputStream), 
-				  ([_MapStringBoolean/])options.get(XMLResource.OPTION_PARSER_FEATURES), 
-				  ([_MapStringWildcard/])options.get(XMLResource.OPTION_PARSER_PROPERTIES), 
-				  Boolean.TRUE.equals(options.get(XMLResource.OPTION_USE_LEXICAL_HANDLER))).eContainer());
-		}
-		else
-		{  
-			super.doLoad(inputStream, options);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-  [if (genModel.useClassOverrideAnnotation())]
-	@Override
-  [/if]
-	public void doLoad(InputSource inputSource, [_Map/] options) throws IOException
-	{
-		if (options != null && Boolean.TRUE.equals(options.get(OPTION_USE_DATA_CONVERTER)))
-		{
-		  getContents().add
-			 (load
-				 (inputSource,
-				  ([_MapStringBoolean/])options.get(XMLResource.OPTION_PARSER_FEATURES), 
-				  ([_MapStringWildcard/])options.get(XMLResource.OPTION_PARSER_PROPERTIES), 
-				  Boolean.TRUE.equals(options.get(XMLResource.OPTION_USE_LEXICAL_HANDLER))).eContainer());
-		}
-		else
-		{  
-			super.doLoad(inputSource, options);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static final XMLParserPool parserPool = new XMLParserPoolImpl();
-
-	/**
-	 * Loads an instance from the input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param inputSource the input from which to load.
-	 * @param features a map of the parser features and their values.
-	 * @param properties a map of a parser properties and their values.
-	 * @param useLexicalHandler whether a lexical handler should be used during loading.
-	 * @return the root object; for the case of a document root, the child of that document root is return.
-	 * @throws ParserConfigurationException
-	 * @throws SAXException
-	 * @generated
-	 */
-	public static EObject load(InputSource inputSource, [_MapStringBoolean/] features, [_MapStringWildcard/] properties, boolean useLexicalHandler) throws IOException
-	{
-		[_MapStringBoolean/] requiredFeatures = new [_MapStringBoolean.replaceAll('Map','HashMap')/]();
-		requiredFeatures.put("http://xml.org/sax/features/namespaces", Boolean.TRUE); 
-		if (features != null)
-		{
-			requiredFeatures.putAll(features);
-		}
-		
-		if (properties == null)
-		{
-			properties = Collections.[if (genModel.useGenerics())]emptyMap()[else]EMPTY_MAP[/if];
-		}
-		
-		SAXParser saxParser = null;
-		try
-		{
-			saxParser = parserPool.get(requiredFeatures, properties, useLexicalHandler);
-			final FrameFactory.DocumentRootStackFrame documentRoot = FrameFactory.INSTANCE.pushDocumentRoot(null, null);
-			XMLTypeResourceImpl.Handler handler = new XMLTypeResourceImpl.Handler(documentRoot);
-			saxParser.parse(inputSource, handler);
-		[if (genModel.suppressEMFTypes)]
-			return (EObject)((EObject)FrameFactory.INSTANCE.popDocumentRoot(documentRoot)).eContents().get(0);
-		[else]
-			return FrameFactory.INSTANCE.popDocumentRoot(documentRoot).eContents().get(0);
-		[/if]
-		}
-		catch (Exception exception)
-		{
-			throw new IOWrappedException(exception);
-		}
-		finally
-		{
-			parserPool.release(saxParser, requiredFeatures, properties, useLexicalHandler);
-		}
-	}
-
-	[/if]
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public final static class FrameFactory
-	{
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final FrameFactory INSTANCE = new FrameFactory();
-	
-	[for (genClass : GenClass | genPackage.genClasses)]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected [genClass.getName()/]StackFrame [genClass.getSafeUncapName()/];
-
-	[/for]
-	[for (genDataType : GenDataType | genPackage.getAllGenDataTypes())]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected [_DataFrame/] [genDataType.getSafeUncapName()/];
-
-	[/for]
-	[for (genClass : GenClass | genPackage.genClasses)]
-		[let attributes : Sequence(EStructuralFeature) = genModel.getAllExtendedMetaDataAttributes(genClass.ecoreClass)]
-			[let elements : Sequence(EStructuralFeature) = genModel.getAllExtendedMetaDataElements(genClass.ecoreClass)]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public [genClass.getName()/]StackFrame push[genClass.getName()/]([_StackFrame/] previous, Attributes attributes)
-		{
-			 [genClass.getName()/]StackFrame result[genClass.getName()/] = [genClass.getSafeUncapName()/] == null ? new [genClass.getName()/]StackFrame() : [genClass.getSafeUncapName()/];
-			 [genClass.getSafeUncapName()/] = null;
-			 result[genClass.getName()/].pushOnto(previous);
-			 result[genClass.getName()/].handleAttributes(attributes);
-			 return result[genClass.getName()/];
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public [genClass.getImportedInterfaceName()/] pop[genClass.getName()/]([genClass.getName()/]StackFrame [genClass.getSafeUncapName()/])
-		{
-			[genClass.getImportedInterfaceName()/] result[genClass.getName()/]Value = [genClass.getSafeUncapName()/].pop[genClass.getName()/]();
-			this.[genClass.getSafeUncapName()/] = [genClass.getSafeUncapName()/];
-			return result[genClass.getName()/]Value;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static class [genClass.getName()/]StackFrame extends [_StackFrame/]
-		{
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected [genClass.getImportedInterfaceName()/] the[genClass.getName()/];
-		
-		[for (genFeature : GenFeature | genClass.getAllGenFeatures())]
-			[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
-			[if ((elements->includes(genFeature.ecoreFeature) or attributes->includes(genFeature.ecoreFeature)) and name.index(':') < 0)]
-				[if (genFeature.isReferenceType())]
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected [genFeature.getTypeGenClass().genPackage.getImportedResourceClassName()/].FrameFactory.[genFeature.getTypeGenClass().getName()/]StackFrame [genFeature.getSafeName()/];
-
-				[else]
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected [_DataFrame/] [genFeature.getSafeName()/];
-		
-				[/if]
-			[/if]
-			[/let]
-		[/for]
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-  [if (genModel.useClassOverrideAnnotation())]
-			@Override
-  [/if]
-			public void handleAttributes(Attributes attributes)
-			{
-	[comment int count = 0; for (GenFeature genFeature : genClass.getAllGenFeatures()) /]
-		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
-			->select(f : GenFeature| attributes->includes(f.ecoreFeature)
-				and not f.isDerived()
-				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0
-				and not f.isReferenceType())]
-			[for (genFeature : GenFeature | featuresToHandle)]
-				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
-					[let namespace : String = genModel.getExtendedMetaDataNamespaceAsLiteral(genFeature.ecoreFeature)]
-						[let genClassifier : GenClassifier = genFeature.getTypeGenClassifier()]
-				[if (i = 0)]
-				String theValue = attributes.getValue([namespace/], "[name/]");
-				[else]
-				theValue = attributes.getValue([namespace/], "[name/]");
-				[/if]
-				if (theValue != null)
-				{
-				[if (genClassifier.genPackage.dataTypeConverters)]
-					the[genClass.getName()/].set[genFeature.getAccessorName()/]([genClassifier.genPackage.getQualifiedFactoryInstanceAccessor()/].create[genClassifier.getName()/](theValue));
-				[else]
-					the[genClass.getName()/].set[genFeature.getAccessorName()/](([genFeature.getImportedType(null)/])[genClassifier.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genClassifier.getQualifiedClassifierAccessor()/], theValue));
-				[/if]
-				}
-						[/let]
-					[/let]
-				[/let]
-			[/for]
-			[if (featuresToHandle->isEmpty())]
-				// There are attributes to handle.
-			[/if]
-		[/let]
-			}
-		
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-  [if (genModel.useClassOverrideAnnotation())]
-			@Override
-  [/if]
-			public [_StackFrame/] startElement(String namespace, String localName, String qName, Attributes attributes) throws SAXException
-			{
-		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
-			->select(f : GenFeature | elements->includes(f.ecoreFeature)
-				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0)]
-			[for (genFeature : GenFeature | featuresToHandle)]
-				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
-					[let namespace : String = genModel.getExtendedMetaDataNamespaceAsLiteral(genFeature.ecoreFeature)]
-				[if (i > 0)]else [/if]if ("[name/]".equals(localName) && [namespace/].equals(namespace))
-				{
-					return [genFeature.getSafeName()/] = [genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.push[genFeature.getTypeGenClassifier().getName()/](this, attributes);
-				}
-					[/let]
-				[/let]
-			[/for]
-			[if (featuresToHandle->isEmpty())]
-				return super.startElement(namespace, localName, qName, attributes);
-			[else]
-				else
-				{
-					return super.startElement(namespace, localName, qName, attributes);
-				}
-			[/if]
-		[/let]
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-  [if (genModel.useClassOverrideAnnotation())]
-			@Override
-  [/if]
-			public void endElement([_StackFrame/] child) throws SAXException
-			{
-		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
-			->select(f : GenFeature | elements->includes(f.ecoreFeature)
-				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0)]
-			[for (genFeature : GenFeature | featuresToHandle)]
-				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
-				[if (i > 0)]else [/if]if (child == [genFeature.getSafeName()/])
-				{
-				[if (genFeature.isListType())]
-					the[genClass.getName()/].[genFeature.getGetAccessor()/]().add([genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.pop[genFeature.getTypeGenClassifier().getName()/]([genFeature.getSafeName()/]));
-				[else]
-					the[genClass.getName()/].set[genFeature.getAccessorName()/]([genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.pop[genFeature.getTypeGenClassifier().getName()/]([genFeature.getSafeName()/]));
-				[/if]
-					[genFeature.getSafeName()/] = null;
-				}
-				[/let]
-			[/for]
-			[if (featuresToHandle->isEmpty())]
-				super.endElement(child);
-			[else]
-				else
-				{
-					super.endElement(child);
-				}
-			[/if]
-		[/let]
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-  [if (genModel.useClassOverrideAnnotation())]
-			@Override
-  [/if]
-			public void create()
-			{
-				the[genClass.getName()/] = [genPackage.getQualifiedFactoryInstanceAccessor()/].create[genClass.getName()/]();
-			}
-		
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected [genClass.getImportedInterfaceName()/] pop[genClass.getName()/]()
-			{
-				pop();
-				[genClass.getImportedInterfaceName()/] result[genClass.getName()/]Value = the[genClass.getName()/];
-				the[genClass.getName()/] = null;
-				return result[genClass.getName()/]Value;
-			}
-		
-		}
-
-			[/let]
-		[/let]
-	[/for]
-	[for (genDataType : GenDataType | genPackage.getAllGenDataTypes())]
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public [_DataFrame/] push[genDataType.getName()/]([_StackFrame/] previous, Attributes attributes)
-		{
-			 [_DataFrame/] result[genDataType.getName()/] = [genDataType.getSafeUncapName()/] == null ? new [_DataFrame/]() : [genDataType.getSafeUncapName()/];
-			 [genDataType.getSafeUncapName()/] = null;
-			 result[genDataType.getName()/].pushOnto(previous);
-			 result[genDataType.getName()/].handleAttributes(attributes);
-			 return result[genDataType.getName()/];
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public [genDataType.getImportedParameterizedInstanceClassName()/] pop[genDataType.getName()/]([_DataFrame/] [genDataType.getSafeUncapName()/])
-		{
-		[if (genDataType.genPackage.dataTypeConverters)]
-			[genDataType.getImportedParameterizedInstanceClassName()/] result[genDataType.getName()/]Value = [genDataType.genPackage.getQualifiedFactoryInstanceAccessor()/].create[genDataType.getName()/]([genDataType.getSafeUncapName()/].popValue());
-		[else][if (genDataType.isPrimitiveType() and not genModel.isJDK50())]
-			[genDataType.getImportedInstanceClassName()/] result[genDataType.getName()/]Value = (([genDataType.getObjectInstanceClassName()/])[genDataType.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genDataType.getQualifiedClassifierAccessor()/], [genDataType.getSafeUncapName()/].popValue())).[genDataType.getPrimitiveValueFunction()/]();
-		[else]
-			[genDataType.getImportedInstanceClassName()/] result[genDataType.getName()/]Value = ([genDataType.getObjectInstanceClassName()/])[genDataType.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genDataType.getQualifiedClassifierAccessor()/], [genDataType.getSafeUncapName()/].popValue());
-		[/if][/if]
-			this.[genDataType.getSafeUncapName()/] = [genDataType.getSafeUncapName()/];
-			return result[genDataType.getName()/]Value;
-		}
-
-	[/for]
-	}
-
-[/let]
-[/let]
-[/let]
-[/let]
-[/let]
-[/if]
-} //[className/]
-[/template]
-
-[query public resourceClassPath(genPackage : GenPackage) : String
-	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'
-		+ genPackage.getQualifiedResourceClassName().toPath() + '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl
deleted file mode 100644
index aac751d53f3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl
+++ /dev/null
@@ -1,189 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- Obeo - Initial API and implementation
- CEA LIST - Modification to support Facade code generation[/comment]
-[comment encoding = UTF-8 /]
-[module WrapperClass('http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/papyrus/facademapping','http://www.eclipse.org/emf/2002/Ecore')]
-
-[import org::eclipse::emf::eef::codegen::ecore::services::common /]
-[import org::eclipse::emf::eef::codegen::ecore::services::header /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
-[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
-[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
-[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
-
-
-[template public wrapperClass(genPackage : GenPackage)  { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'Wrapper'}]
-
-[genModel.initializeImportManager(packageName, className)/]
-
-[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
-
-
-[file (genPackage.wrapperClassPath(className), false, 'UTF-8')]
-[genModel.includeHeader()/]
-package [packageName/];
-[let content : String = genPackage.wrapperFileContent(genModel, className)]
-[genModel.genSortedImports()/]
-[content/]
-[/let]
-[/file]
-
-[/template]
-
-[template protected wrapperFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
-/**
- * <!-- begin-user-doc -->
- * The <b>Wrapper</b> associated with the package.
- * <!-- end-user-doc -->
- * @see [genPackage.getQualifiedResourceFactoryClassName()/]
- * @generated
- */
-public class [className/] 
-{
-private static volatile Wrapper instance = null;
-
-	private Wrapper() {
-		super();
-	}
-
-	public final static Wrapper getInstance() {
-		if(instance == null) {
-			synchronized(Wrapper.class) {
-				if(instance == null) {
-					instance = new Wrapper();
-				}
-			}
-		}
-		return instance;
-	}
-
-	public [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] getMappingFromUML([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement) {
-		
-		[genModel.getAllMetaclassMappings().genMappingfromUML(genModel, genPackage)/]
-			
-		return null;
-	}
-
-	public <E extends [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]> void updateCache([genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<E> update, [genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<E> cache) {
-		//Empty the cache
-		while(!cache.isEmpty()) {
-			((org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList<E>)cache).silentRemove(0);
-		}
-
-
-		for(int i = 0; i < update.size(); i++) {
-			E elementInUpdate = update.get(i);
-			((org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList<E>)cache).silentAdd(i, elementInUpdate);
-		}
-	}
-
-	public <E extends [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]> [genModel.getImportedName('org.eclipse.emf.common.util.EList')/] toRepresentedList([genModel.getImportedName('java.util.List')/]<E> list) {
-		[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]> result = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]>();
-
-		for(E representingElement : list) {
-			result.add(representingElement.get__Represented());
-		}
-
-		return result;
-	}
-
-	public [genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/] getFeatureMappingFromUML([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/] feature) {
-
-		[genModel.getAllFeatureMappings().getFeatureMappingFromUML(genModel, genPackage)/]
-
-
-		return null;
-	}
-
-	public Enum getEnumMappingFromUML(Enum value) {
-
-		[genModel.getAllEnumLiteralMappings().genEnumMappingfromUML(genModel, genPackage)/]
-
-		return null;
-	}
-
-	public Enum getEnumMappingFromSpecific(Enum value) {
-
-		[genModel.getAllEnumLiteralMappings().genEnumMappingfromSpecific(genModel, genPackage)/]
-
-		return null;
-	}
-
-	public [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] findOrCreateSpecific([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement) {
-		[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/]> adapters = umlElement.eAdapters();
-		for([genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/] adapter : adapters) {
-			if(adapter instanceof [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]) {
-				return (([genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/])adapter).get__Representing();
-			}
-		}
-
-		[genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] eClassifier = getMappingFromUML(umlElement);
-		if(eClassifier != null) {
-			if(eClassifier instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EClass')/]) {
-				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genPackage.getImportedFactoryInterfaceName()/].eINSTANCE.create(([genModel.getImportedName('org.eclipse.emf.ecore.EClass')/])eClassifier);
-				if(representingElement instanceof [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]) {
-					//Override represented
-
-					(([genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/])representingElement).set__Represented(umlElement);
-					[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/] adapter = new [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]();
-					adapter.set__Representing(representingElement);
-					umlElement.eAdapters().add(adapter);
-					return representingElement;
-				}
-			}
-		}
-
-
-		return null;
-	}
-}
-
-[/template]
-
-[template public genEnumMappingfromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
-
-	if(value ==  [getPackagePathFromMapping(mapping)/].[getUMLEnumElementFromMapping(mapping)/]) {
-		return [genModel.getImportedName(genPackage.getInterfacePackageName())/].[getFacadeEnumElementFromMapping(mapping)/];
-	}
-
-[/template]
-
-[template public genEnumMappingfromSpecific(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
-
-	if(value ==  [genModel.getImportedName(genPackage.getInterfacePackageName())/].[getFacadeEnumElementFromMapping(mapping)/]) {
-		return [getPackagePathFromMapping(mapping)/].[getUMLEnumElementFromMapping(mapping)/];
-	}
-
-[/template]
-
-[template public genMappingfromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
-
-	if(umlElement.eClass() == [genModel.getImportedName(getUMLPackageName(mapping))/].eINSTANCE.get[getUMLAccessorName(mapping,genModel)/]()) {
-		[mapping.getCorrespondingStereotypeMapping(genModel,genPackage)/]
-
-		return [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[getClassifierAccessorName(genModel,mapping)/]();
-	}
-
-[/template]
-
-[template public getFeatureMappingFromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
-	if(feature == [genModel.getImportedName(getUMLPackageName(mapping))/].eINSTANCE.get[getUMLFeatureFromMapping(mapping,genModel)/]()) {
-		return [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[getFeatureAccessorName(genModel,mapping)/]();
-	
-	}
-[/template]
-
-[query public wrapperClassPath(genPackage : GenPackage, className : String) : String
-	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
-		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl
deleted file mode 100644
index ef1f5c7b015..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl
+++ /dev/null
@@ -1,127 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- CEA LIST - Initial API and implementation[/comment]
-[comment encoding = UTF-8 /]
-[module FacadeCodegenUtils('http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/papyrus/facademapping', 'http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/uml2/5.0.0/UML')/]
-
-[query public getUMLMetaElement( facadeMetaElement : EObject,  genModel :GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLMetaElement( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel}) 
-/]
-
-[query public findUMLMetaElement( facadeMetaElement : EObject,  genModel :GenModel) : EObject
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLMetaElement( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel}) 
-/]
-
-[query public findUMLGetAccessor( facadeMetaFeature : EObject,  facadeGenModel :GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLGetAccessor( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaFeature,facadeGenModel}) 
-/]
-
-[query public findUMLAccessorName( facadeMetaFeature : EObject,  facadeGenModel :GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLAccessorName( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaFeature,facadeGenModel}) 
-/]
-
-[query public getClassifierAccessorName(  genModel:GenModel,  mapping:Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getClassifierAccessorName( org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.papyrus.facademapping.Mapping)', Sequence{genModel,mapping}) 
-/]
-
-[query public getFeatureAccessorName(  genModel:GenModel,  mapping:Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getFeatureAccessorName( org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.papyrus.facademapping.Mapping)', Sequence{genModel,mapping}) 
-/]
-
-[query public getUMLPackageName( mapping : Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLPackageName( org.eclipse.papyrus.facademapping.Mapping)', Sequence{mapping}) 
-/]
-
-[query public getPackagePathFromUML( facadeMetaElement:EObject) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getPackagePathFromUML(org.eclipse.emf.ecore.EObject)', Sequence{facadeMetaElement}) 
-/]
-
-[query public getPackagePathFromMapping( mapping : Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getPackagePathFromMapping(org.eclipse.papyrus.facademapping.Mapping)', Sequence{mapping}) 
-/]
-
-[query public getUMLFactory( facadeMetaElement:EObject,  genModel:GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLFactory( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel})
-/]
-
-[query public getUMLAccessorName( mapping : Mapping,  genModel :GenModel) : EObject
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLAccessorName( org.eclipse.papyrus.facademapping.Mapping ,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{mapping,genModel}) 
-/]
-
-[query public getAllMetaclassMappings( facadeGenModel :GenModel) : Sequence(Mapping)
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllMetaclassMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
-/]
-
-[query public getUMLFeatureFromMapping( mapping : Mapping,  genModel :GenModel) : EObject
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLFeatureFromMapping( org.eclipse.papyrus.facademapping.Mapping ,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{mapping,genModel}) 
-/]
-
-[query public getAllFeatureMappings( facadeGenModel :GenModel) : Sequence(Mapping)
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllFeatureMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
-/]
-
-[query public getAppropriateQualifiedTypeName( genClassifier :GenClassifier) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAppropriateQualifiedTypeName(org.eclipse.emf.codegen.ecore.genmodel.GenClassifier)', Sequence{genClassifier}) 
-/]
-
-[query public getAllStereotypeQualifiedNames( facadeMetaElement:EObject,  facadeGenModel:GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllStereotypeQualifiedNames( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,facadeGenModel})
-/]
-
-[query public getNonAssociationStereotypeQualifiedNames( facadeMetaElement:EObject,  facadeGenModel:GenModel) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getNonAssociationStereotypeQualifiedNames( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,facadeGenModel})
-/]
-
-[query public getUMLEnumElementFromMapping( mapping : Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLEnumElementFromMapping( org.eclipse.papyrus.facademapping.Mapping )', Sequence{mapping}) 
-/]
-
-[query public getFacadeEnumElementFromMapping( mapping : Mapping) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getFacadeEnumElementFromMapping( org.eclipse.papyrus.facademapping.Mapping )', Sequence{mapping}) 
-/]
-
-[query public getAllEnumLiteralMappings( facadeGenModel :GenModel) : Sequence(Mapping)
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllEnumLiteralMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
-/]
-
-[query public isStereotypeProperty(genFeature:GenFeature) : Boolean
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isStereotypeProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
-/]
-
-[query public isExtensionProperty(genFeature:GenFeature) : Boolean
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isExtensionProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
-/]
-
-[query public isExtentionStereotypeProperty(genFeature:GenFeature) : Boolean
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isExtentionStereotypeProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
-/]
-
-[query public isPrimtiveList(genTypedElement:GenTypedElement) : Boolean
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isPrimtiveList(org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement)', Sequence{genTypedElement}) 
-/]
-
-[query public isPrimitive(genTypedElement:GenTypedElement) : Boolean
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isPrimitive(org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement)', Sequence{genTypedElement}) 
-/]
-
-[query public getCorrespondingStereotypeMapping(mapping : Mapping, genModel:GenModel,genPackage:GenPackage) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getCorrespondingStereotypeMapping(org.eclipse.papyrus.facademapping.Mapping,org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.emf.codegen.ecore.genmodel.GenPackage)', Sequence{mapping,genModel,genPackage}) 
-/]
-
-[query public getStereotypeQualifiedName(genFeature:GenFeature) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getStereotypeQualifiedName(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
-/]
-
-[query public copyEcore(genPackage:GenPackage) : OclVoid 
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'copyEcore(org.eclipse.emf.codegen.ecore.genmodel.GenPackage)', Sequence{genPackage}) 
-/]
-
-[query public initUtilsCaches(traceabilityContext : OclAny) : OclVoid 
-= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'initUtilsCaches()', Sequence{}) 
-/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl
deleted file mode 100644
index f825f95aa75..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-[comment]Copyright (c) 2013 CEA LIST.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- CEA LIST - Initial API and implementation[/comment]
-[comment encoding = UTF-8 /]
-[module WrappingListUtils('http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/papyrus/facademapping', 'http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/uml2/2.2.0/GenModel')/]
-
-[query public getWrappingListConstructor(genClass:GenClass,  genFeature:GenFeature,  typeArgument:String) : String
-= invoke('org.eclipse.papyrus.facade.codegen.utils.WrappingListUtils', 'getWrappingListConstructor(org.eclipse.emf.codegen.ecore.genmodel.GenClass, org.eclipse.emf.codegen.ecore.genmodel.GenFeature, java.lang.String)', Sequence{ genClass,  genFeature,  typeArgument})/] 
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java
deleted file mode 100644
index 39d5f38e73e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.codegen;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class FacadeCodeGenPlugin extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.facade.codegen"; //$NON-NLS-1$

-

-	// The shared instance

-	private static FacadeCodeGenPlugin plugin;

-

-	/** The log. */

-	public static LogHelper log;

-

-	public FacadeCodeGenPlugin() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static FacadeCodeGenPlugin getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java
deleted file mode 100644
index 5f284ad3ffc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.codegen;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facade.codegen.messages"; //$NON-NLS-1$

-

-	public static String GenerateCodeAction_0;

-

-	public static String GenerateFacadeAction_0;

-

-	public static String GenerateFacadeAction_1;

-

-	public static String GenerateFacadeAction_3;

-

-	public static String GenerateFacadeAction_5;

-

-	public static String GenerateFacadeAction_6;

-

-	public static String FacadeCodegenUtils_48;

-

-	public static String FacadeCodegenUtils_49;

-

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java
deleted file mode 100644
index f2a9901fd2c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.codegen.handlers;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspace;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.SubProgressMonitor;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.emf.codegen.ecore.Generator;

-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

-import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;

-import org.eclipse.emf.common.util.BasicMonitor;

-import org.eclipse.emf.common.util.UniqueEList;

-import org.eclipse.emf.eef.codegen.flow.Step;

-import org.eclipse.emf.eef.codegen.flow.Workflow;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin;

-import org.eclipse.papyrus.facade.codegen.Messages;

-import org.eclipse.papyrus.facade.codegen.genfacade.GenFacade;

-import org.eclipse.papyrus.facade.codegen.utils.EEFGeneratorAdapter;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.ISelectionService;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.handlers.HandlerUtil;

-

-/**

- * Handler to generate Facade code.

- */

-public class GenerateFacadeHandler extends AbstractHandler {

-

-

-	/** The workspace. */

-	protected IWorkspace workspace = ResourcesPlugin.getWorkspace();

-

-

-	/**

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 *

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		List<GenModel> emfGenModels = new ArrayList<GenModel>();

-

-		// get workbench window

-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);

-		// set selection service

-		ISelectionService service = window.getSelectionService();

-		// set structured selection

-		IStructuredSelection structured = (IStructuredSelection) service.getSelection();

-

-		if (structured != null) {

-			for (Object selectedElement : structured.toList()) {

-				if (selectedElement instanceof GenModel) {

-					emfGenModels.add((GenModel) selectedElement);

-				}

-			}

-		}

-

-		if (emfGenModels != null) {

-			final Workflow flow = initEMFGenFlow(emfGenModels);

-			flow.prepare();

-			Job job = new Job(Messages.GenerateCodeAction_0) {

-

-				@Override

-				protected IStatus run(IProgressMonitor monitor) {

-					flow.execute(monitor);

-					monitor.done();

-					return Status.OK_STATUS;

-				}

-

-			};

-			job.setUser(true);

-			job.schedule();

-		}

-

-		return null;

-	}

-

-	/**

-	 * Inits the emf gen flow.

-	 *

-	 * @param emfGenModels

-	 *            the emf Genmodels to generate the facade for

-	 * @return the workflow

-	 */

-	protected Workflow initEMFGenFlow(List<GenModel> emfGenModels) {

-		final Workflow flow = new Workflow(Messages.GenerateFacadeAction_0, Display.getCurrent().getActiveShell());

-		for (final org.eclipse.emf.codegen.ecore.genmodel.GenModel emfGenModel : emfGenModels) {

-			String s2 = Messages.GenerateFacadeAction_1 + emfGenModel.eResource().getURI().toString();

-			flow.addStep(s2, new Step("FACADE MODEL") { //$NON-NLS-1$

-

-						@Override

-						public IStatus execute(IProgressMonitor monitor) {

-							// create the model project

-							IProject modelProject = getProjectFromStringPath(emfGenModel.getModelProjectDirectory());

-							if (modelProject == null) {

-								return Status.OK_STATUS;

-							}

-							List<IProject> referencedProjects = new UniqueEList<IProject>();

-							if (!workspace.getRoot().exists(modelProject.getFullPath())) {

-								if (modelProject.getLocation().toFile().exists()) {

-									modelProject.getLocation().toFile().delete();

-								}

-								modelProject = Generator.createEMFProject(new Path(emfGenModel.getModelDirectory()), modelProject.getLocation(), referencedProjects, new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN), Generator.EMF_MODEL_PROJECT_STYLE

-										| Generator.EMF_PLUGIN_PROJECT_STYLE);

-							} else if (!modelProject.isAccessible()) {

-								try {

-									modelProject.open(monitor);

-								} catch (CoreException e) {

-									return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

-								}

-							}

-							// generate using acceleo

-							List<String> args = new ArrayList<String>();

-							File modelDirectory = modelProject.getLocation().toFile();

-							try {

-								GenFacade generator = new GenFacade(emfGenModel, modelDirectory, args);

-								generator.doGenerate(BasicMonitor.toMonitor(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)));

-							} catch (IOException e) {

-								return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

-							}

-							return Status.OK_STATUS;

-						}

-					});

-

-			if (emfGenModel.isCodeFormatting()) {

-				refresh(emfGenModel, flow);

-

-				String s2prime = Messages.GenerateFacadeAction_5;

-				flow.addStep(s2prime, new Step(s2prime) {

-

-					@Override

-					public IStatus execute(IProgressMonitor monitor) {

-						EEFGeneratorAdapter eefGen = new EEFGeneratorAdapter();

-						eefGen.generate(emfGenModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, BasicMonitor.toMonitor(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)));

-						return Status.OK_STATUS;

-					}

-				});

-			}

-

-			refresh(emfGenModel, flow);

-		}

-		return flow;

-	}

-

-	/**

-	 * Refresh.

-	 *

-	 * @param emfGenModel

-	 *            the emf GenModel that is used to generate facade code for

-	 * @param flow

-	 *            the flow

-	 */

-	protected void refresh(final org.eclipse.emf.codegen.ecore.genmodel.GenModel emfGenModel, Workflow flow) {

-		String s3 = Messages.GenerateFacadeAction_6 + emfGenModel.eResource().getURI().toString();

-		flow.addStep(s3, new Step("REFRESH") { //$NON-NLS-1$

-

-					@Override

-					public IStatus execute(IProgressMonitor monitor) {

-						// refresh model project

-						IProject modelProject = getProjectFromStringPath(emfGenModel.getModelProjectDirectory());

-						if (modelProject == null) {

-							return Status.OK_STATUS;

-						}

-						try {

-							if (!modelProject.isOpen()) {

-								modelProject.open(monitor);

-							}

-							modelProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);

-						} catch (CoreException e) {

-							return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

-						}

-						return Status.OK_STATUS;

-					}

-				});

-	}

-

-

-

-

-

-	/**

-	 * Extract project.

-	 *

-	 * @param stringPath

-	 *            the path to the project encoded as a string

-	 * @return the corresponding project

-	 */

-	protected IProject getProjectFromStringPath(String stringPath) {

-		IPath path = new Path(stringPath);

-		if (path.isEmpty()) {

-			return null;

-		}

-		return workspace.getRoot().getProject(path.segment(0));

-	}

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties
deleted file mode 100644
index 16cb71d9451..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-GenerateCodeAction_0=EEF architecture generation

-GenerateFacadeAction_0=Generate Facade code 

-GenerateFacadeAction_1=Generate Facade code for 

-GenerateFacadeAction_3=Refreshing workspace 

-GenerateFacadeAction_5=Formatting generated files

-GenerateFacadeAction_6=Refreshing workspace 

-FacadeCodegenUtils_48=Problem with : 

-FacadeCodegenUtils_49=Problem with : 

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java
deleted file mode 100644
index 046eb1b24a7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.facade.codegen.utils;
-
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.BasicMonitor;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.Monitor;
-import org.eclipse.emf.common.util.URI;
-
-/**
- * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
- */
-public class EEFGeneratorAdapter extends AbstractGeneratorAdapter {
-
-	private static final String JAVA_EXT_FILE = "java"; //$NON-NLS-1$
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter#canGenerate(java.lang.Object, java.lang.Object)
-	 */
-	@Override
-	public boolean canGenerate(Object object, Object projectType) {
-		return EMFPlugin.IS_ECLIPSE_RUNNING && object instanceof GenModel;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter#doGenerate(java.lang.Object, java.lang.Object, org.eclipse.emf.common.util.Monitor)
-	 */
-	@Override
-	protected Diagnostic doGenerate(Object object, Object projectType, Monitor monitor) throws Exception {
-		GenModel genmodel = (GenModel) object;
-		IFolder folder = null;
-		final IProgressMonitor progressMonitor = BasicMonitor.toIProgressMonitor(monitor);
-		if (projectType == GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE) {
-			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getModelDirectory(), true));
-			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getModelDirectory())); // path);
-			if (folder != null && folder.isAccessible()) {
-				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
-			}
-		} else if (projectType == GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE) {
-			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getEditDirectory(), true));
-			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getEditDirectory()));
-			if (folder != null && folder.isAccessible()) {
-				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
-			}
-		} else if (projectType == GenBaseGeneratorAdapter.EDITOR_PROJECT_TYPE) {
-			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getEditorDirectory(), true));
-			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getEditorDirectory()));
-			if (folder != null && folder.isAccessible()) {
-				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
-			}
-		}
-		return Diagnostic.OK_INSTANCE;
-	}
-
-	/**
-	 * @param genmodel
-	 * @param genPack
-	 * @return
-	 */
-	protected IPath buildModelPath(GenModel genmodel, GenPackage genPack) {
-		String pathStr = genmodel.getModelDirectory() + "/" + genPack.getQualifiedPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		IPath path = new Path(pathStr);
-		return path;
-	}
-
-	/**
-	 * @param genmodel
-	 * @param genPack
-	 * @return
-	 */
-	protected IPath buildProviderPath(GenModel genmodel, GenPackage genPack) {
-		String pathStr = genmodel.getEditDirectory();
-		if (genPack.getProviderPackageName() != null && !genPack.getProviderPackageName().equals("")) { //$NON-NLS-1$
-			pathStr += "/" + genPack.getProviderPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		IPath path = new Path(pathStr);
-		return path;
-	}
-
-	/**
-	 * @param genmodel
-	 * @param genPack
-	 * @return
-	 */
-	protected IPath buildPresentationPath(GenModel genmodel, GenPackage genPack) {
-		String pathStr = genmodel.getEditorDirectory();
-		if (genPack.getPresentationPackageName() != null && !genPack.getPresentationPackageName().equals("")) { //$NON-NLS-1$
-			pathStr += "/" + genPack.getPresentationPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		IPath path = new Path(pathStr);
-		return path;
-	}
-
-	/**
-	 * IResourceVisitor responsible to format all java code in a given folder.
-	 *
-	 * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
-	 */
-	private final class ResourceVisitorFormatter implements IResourceVisitor {
-
-		private final Object codeFormatter;
-
-		private final IProgressMonitor progressMonitor;
-
-		private ResourceVisitorFormatter(Object codeFormatter, IProgressMonitor progressMonitor) {
-			this.codeFormatter = codeFormatter;
-			this.progressMonitor = progressMonitor;
-		}
-
-		@Override
-		public boolean visit(IResource resource) throws CoreException {
-			try {
-				String fileExtension = ((IFile) resource).getFileExtension();
-				if (fileExtension != null) {
-					if (resource instanceof IFile && fileExtension.equals(JAVA_EXT_FILE)) {
-						formatFile((IFile) resource, codeFormatter, progressMonitor);
-					}
-				}
-				return true;
-			} catch (Exception e) {
-				return false;
-			}
-		}
-
-		/**
-		 * @param file
-		 * @param codeFormatter
-		 * @param progressMonitor
-		 * @throws Exception
-		 */
-		private void formatFile(IFile file, Object codeFormatter, IProgressMonitor progressMonitor) throws Exception {
-			URI createPlatformResourceURI = URI.createURI(file.getFullPath().toString(), true);
-			final String contentsStr = getContents(createPlatformResourceURI, null);
-			String formatedContentsStr = formatCode(contentsStr, codeFormatter, true);
-			ByteArrayInputStream formatedContents = new ByteArrayInputStream(formatedContentsStr.getBytes());
-			file.setContents(formatedContents, true, true, progressMonitor);
-			formatedContents.close();
-		}
-
-	}
-}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java
deleted file mode 100644
index 3acacefc448..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.codegen.utils;

-

-import java.io.File;

-import java.io.IOException;

-import java.nio.file.Files;

-import java.nio.file.StandardCopyOption;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;

-import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;

-import org.eclipse.emf.codegen.ecore.genmodel.GenDataType;

-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;

-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;

-import org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement;

-import org.eclipse.emf.codegen.util.CodeGenUtil;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin;

-import org.eclipse.papyrus.facade.codegen.Messages;

-import org.eclipse.papyrus.facade.utils.CombinationGenerator;

-import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * The utils class used to generate facade code.

- */

-public class FacadeCodegenUtils {

-

-	/** The path to the UML GenModel. */

-	protected final static String UML_GEN_MODEL = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$

-

-	/** A cache of all mappings */

-	protected static HashMap<GenModel, List<Mapping>> allMappingsCache = new HashMap<GenModel, List<Mapping>>();

-

-	/** A cache of stereotyped mappings. */

-	protected static HashMap<GenModel, List<StereotypedMapping>> stereotypedMappingsCache = new HashMap<GenModel, List<StereotypedMapping>>();

-

-	/** A cache of enum literal mappings. */

-	protected static HashMap<GenModel, List<Mapping>> enumLiteralMappingsCache = new HashMap<GenModel, List<Mapping>>();

-

-	/** A cache of feature mappings. */

-	protected static HashMap<GenModel, List<Mapping>> featureMappingsCache = new HashMap<GenModel, List<Mapping>>();

-

-	/** A cache of all metaclass mappings. */

-	protected static HashMap<GenModel, List<Mapping>> allMetaclassMappingsCache = new HashMap<GenModel, List<Mapping>>();

-

-	private static Set<String> javaDefaultTypes = null;

-

-	private static Set<String> ecoreDefaultTypes;

-

-

-	/**

-	 * Find the mapping model from a genModel. Basically, the mapping model must be in the same folder as the ecoremodel underlying the GenModel and

-	 * named with the same filename but the file extension.

-	 *

-	 * @param genModel

-	 *            the GenModel that will be used to try to find the mapping model

-	 * @return the string

-	 */

-	public static String findMappingModel(GenModel genModel) {

-

-		if (!genModel.getForeignModel().isEmpty()) {

-			String metamodel = genModel.getForeignModel().get(0);

-			metamodel = metamodel.replaceAll(".ecore", ".facademapping"); //$NON-NLS-1$ //$NON-NLS-2$

-

-			URI ecoreURI = genModel.eResource().getURI();

-			ecoreURI = ecoreURI.trimSegments(1);

-			ecoreURI = ecoreURI.appendSegment(metamodel);

-

-			return ecoreURI.toString();

-		}

-		return null;

-

-	}

-

-	/**

-	 * Gets the UML element of a mapping.

-	 *

-	 * @param mapping

-	 *            the mapping to find the UML element for

-	 * @return the UML element mapped in the mapping

-	 */

-	protected static EObject getUMLElement(Mapping mapping) {

-

-		if (mapping instanceof StereotypedMapping) {

-			if (((StereotypedMapping) mapping).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-				EList<EObject> appliedStereotypes = ((StereotypedMapping) mapping).getAppliedStereotypes();

-				if (appliedStereotypes.size() != 1) {

-					return null;

-				} else {

-					return appliedStereotypes.get(0);

-				}

-			} else {

-				return mapping.getUmlElement();

-			}

-		} else {

-			return mapping.getUmlElement();

-		}

-

-	}

-

-	/**

-	 * Gets the all the mappings based on a GenModel of a facade

-	 *

-	 * @param facadeGenModel

-	 *            the GenModel of a facade

-	 * @return all the mappings corresponding to a facade GenModel

-	 */

-	protected static synchronized List<Mapping> getAllMappings(GenModel facadeGenModel) {

-

-		if (!allMappingsCache.containsKey(facadeGenModel)) {

-

-			List<Mapping> allMappings = new ArrayList<Mapping>();

-

-			String mappingModel = findMappingModel(facadeGenModel);

-			if (mappingModel != null) {

-				if (facadeGenModel.eResource() != null) {

-					if (facadeGenModel.eResource().getResourceSet() != null) {

-						ResourceSet resourceSet = facadeGenModel.eResource().getResourceSet();

-						Resource res = resourceSet.getResource(URI.createURI(mappingModel, true), true);

-						if (res != null) {

-							if (!res.getContents().isEmpty()) {

-								EObject root = res.getContents().get(0);

-

-								if (root instanceof FacadeMappping) {

-									FacadeMappping facadeMappping = (FacadeMappping) root;

-

-									for (Mapping mapping : facadeMappping.getMappings()) {

-										allMappings.add(mapping);

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-

-			allMappingsCache.put(facadeGenModel, allMappings);

-		}

-

-		return allMappingsCache.get(facadeGenModel);

-

-	}

-

-	/**

-	 * Get the stereotype qualifiedNames that are applied on the UML element represented by the facadeMetaElement

-	 *

-	 * @param facadeMetaElement

-	 *            the facade metaelement

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return the stereotype qualifiedNames

-	 */

-	public static String getAllStereotypeQualifiedNames(EObject facadeMetaElement, GenModel facadeGenModel) {

-

-		Set<String> result = new HashSet<String>();

-

-

-		for (Mapping mapping : getAllMappings(facadeGenModel)) {

-			if (EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

-				if (mapping instanceof StereotypedMapping) {

-

-					for (EObject stereotype : ((StereotypedMapping) mapping).getAppliedStereotypes()) {

-						if (stereotype instanceof Stereotype) {

-							result.add("\"" + ((Stereotype) stereotype).getQualifiedName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$

-						}

-					}

-				}

-			}

-		}

-

-		if (!result.isEmpty()) {

-			StringBuilder sb = new StringBuilder();

-

-			for (String s : result) {

-				sb.append(s).append(',');

-			}

-

-			sb.deleteCharAt(sb.length() - 1); // delete last comma

-

-			return sb.toString();

-		}

-

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * Get the stereotype qualifiedNames that are applied on the UML element represented by the facadeMetaElement but that are not association kind of

-	 * mapping

-	 *

-	 * @param facadeMetaElement

-	 *            the facade metaelement

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return the stereotype qualifiedNames

-	 */

-	public static String getNonAssociationStereotypeQualifiedNames(EObject facadeMetaElement, GenModel facadeGenModel) {

-

-		Set<String> result = new HashSet<String>();

-

-

-		for (Mapping mapping : getAllMappings(facadeGenModel)) {

-			if (EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

-				if (mapping instanceof StereotypedMapping) {

-

-					if (((StereotypedMapping) mapping).getKind() != ExtensionDefinitionKind.ASSOCIATION) {

-						for (EObject stereotype : ((StereotypedMapping) mapping).getAppliedStereotypes()) {

-							if (stereotype instanceof Stereotype) {

-								result.add("\"" + ((Stereotype) stereotype).getQualifiedName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$

-							}

-						}

-					}

-				}

-			}

-		}

-

-		if (!result.isEmpty()) {

-			StringBuilder sb = new StringBuilder();

-

-			for (String s : result) {

-				sb.append(s).append(',');

-			}

-

-			sb.deleteCharAt(sb.length() - 1); // delete last comma

-

-			return sb.toString();

-		}

-

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * Find UML getAccessor.

-	 *

-	 * @param facadeMetaFeature

-	 *            the facade metafeature

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return the getAccessor

-	 */

-	public static String findUMLGetAccessor(EObject facadeMetaFeature, GenModel facadeGenModel) {

-

-		EObject umlMetaElement = findUMLMetaElement(facadeMetaFeature, facadeGenModel);

-

-		if (umlMetaElement != null) {

-			if (umlMetaElement instanceof ETypedElement) {

-				ResourceSet resourceSet = new ResourceSetImpl();

-				EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

-

-				if (umlGenModel != null) {

-					if (umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

-

-						if (umlMetaElement instanceof EStructuralFeature) {

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) umlGenModel).findGenFeature((EStructuralFeature) umlMetaElement).getGetAccessor();

-						} else if (umlMetaElement instanceof EOperation) {

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) umlGenModel).findGenOperation((EOperation) umlMetaElement).getName();

-						}

-					}

-				}

-			} else if (umlMetaElement instanceof Property) {

-				if (umlMetaElement.eResource() != null) {

-					if (!umlMetaElement.eResource().getContents().isEmpty()) {

-						EObject root = umlMetaElement.eResource().getContents().get(0);

-						if (root instanceof Profile) {

-

-							GenModel profileGen = getGenModel(umlMetaElement);

-							EObject umlMetaFeatureDefinition = ((Profile) root).getDefinition((NamedElement) umlMetaElement);

-							if (umlMetaFeatureDefinition instanceof EStructuralFeature) {

-								return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) profileGen).findGenFeature((EStructuralFeature) umlMetaFeatureDefinition).getGetAccessor();

-							}

-						}

-					}

-				}

-			}

-		}

-

-		return "FAILED_TO_FIND_MAPPED_GET_ACCESSOR"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Try to get the GenModel from an eObject

-	 *

-	 * @param metaElement

-	 *            the metaElement to find the GenMdoel for

-	 * @return the GenModel

-	 */

-	protected static GenModel getGenModel(EObject metaElement) {

-		Map<String, URI> nsURIToGenModelsMap = EcorePlugin.getEPackageNsURIToGenModelLocationMap(true);

-

-

-

-		if (metaElement.eResource() != null) {

-			if (!metaElement.eResource().getContents().isEmpty()) {

-				EObject root = metaElement.eResource().getContents().get(0);

-				if (root instanceof Profile) {

-					Stereotype ePackageStereotype = ((Profile) root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

-					if (ePackageStereotype != null) {

-						Object nsURI = ((Profile) root).getValue(ePackageStereotype, "nsURI"); //$NON-NLS-1$

-						if (nsURI instanceof String) {

-							URI genModelURI = nsURIToGenModelsMap.get(nsURI);

-							String paltformstring = genModelURI.toPlatformString(true);

-							URI pluginURI = URI.createPlatformPluginURI(paltformstring, true);

-							if (pluginURI != null) {

-								ResourceSet resourceSet = new ResourceSetImpl();

-								EObject genModel = resourceSet.getResource(pluginURI, true).getContents().get(0);

-								if (genModel instanceof GenModel) {

-									return (GenModel) genModel;

-								}

-							}

-						}

-					}

-

-				}

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Find UML accessorName of a facade metaFeature.

-	 *

-	 * @param facadeMetaFeature

-	 *            the facade metafeature

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return the string

-	 */

-	public static String findUMLAccessorName(EObject facadeMetaFeature, GenModel facadeGenModel) {

-		EObject umlMetaFeature = findUMLMetaElement(facadeMetaFeature, facadeGenModel);

-

-		if (umlMetaFeature instanceof NamedElement) {

-

-			if (umlMetaFeature.eResource() != null) {

-				if (!umlMetaFeature.eResource().getContents().isEmpty()) {

-					EObject root = umlMetaFeature.eResource().getContents().get(0);

-					if (root instanceof Profile) {

-

-						GenModel profileGen = getGenModel(umlMetaFeature);

-						EObject umlMetaFeatureDefinition = ((Profile) root).getDefinition((NamedElement) umlMetaFeature);

-						if (umlMetaFeatureDefinition instanceof EStructuralFeature) {

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) profileGen).findGenFeature((EStructuralFeature) umlMetaFeatureDefinition).getAccessorName();

-						}

-

-					}

-				}

-			}

-		} else {

-

-			if (umlMetaFeature != null) {

-				if (umlMetaFeature instanceof EStructuralFeature) {

-					ResourceSet resourceSet = new ResourceSetImpl();

-					EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

-

-					if (umlGenModel != null) {

-						if (umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

-

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) umlGenModel).findGenFeature((EStructuralFeature) umlMetaFeature).getAccessorName();

-						}

-					}

-				}

-			}

-		}

-

-		return "FAILED_TO_FIND_MAPPED_GET_ACCESSOR_NAME"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets all the metaclass mappings.

-	 *

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return all mappings that map a metaclass

-	 */

-	public static synchronized List<? extends Mapping> getAllMetaclassMappings(GenModel facadeGenModel) {

-

-		if (!allMetaclassMappingsCache.containsKey(facadeGenModel)) {

-

-			List<Mapping> allMetaclassMappings = new ArrayList<Mapping>();

-

-			for (Mapping mapping : getAllMappings(facadeGenModel)) {

-				if (!(mapping instanceof StereotypedMapping)) {

-					if (mapping.getSpecificDomainElement() instanceof EClassifier) {

-						if (mapping.getUmlElement() != TypesPackage.eINSTANCE.getBoolean() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getString() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getReal()

-								&& mapping.getUmlElement() != TypesPackage.eINSTANCE.getInteger() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getUnlimitedNatural()) {

-							if (!(mapping.getUmlElement() instanceof Stereotype)) {

-								if (mapping.getSpecificDomainElement() instanceof EClass) {

-									if (!((EClass) mapping.getSpecificDomainElement()).isAbstract()) {

-										allMetaclassMappings.add(mapping);

-									}

-								} else {

-									allMetaclassMappings.add(mapping);

-								}

-							}

-						}

-					}

-				} else {

-					if (((StereotypedMapping) mapping).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-						allMetaclassMappings.add(mapping);

-					}

-				}

-			}

-

-			allMetaclassMappingsCache.put(facadeGenModel, allMetaclassMappings);

-		}

-

-		return allMetaclassMappingsCache.get(facadeGenModel);

-	}

-

-	/**

-	 * Initializes caches

-	 */

-	public static void initUtilsCaches() {

-		allMappingsCache.clear();

-		allMetaclassMappingsCache.clear();

-		enumLiteralMappingsCache.clear();

-		featureMappingsCache.clear();

-		stereotypedMappingsCache.clear();

-	}

-

-	/**

-	 * Gets all the enumLiteral mappings.

-	 *

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return all mappings that map an enumLiteral

-	 */

-	public static synchronized List<? extends Mapping> getAllEnumLiteralMappings(GenModel facadeGenModel) {

-

-		if (!enumLiteralMappingsCache.containsKey(facadeGenModel)) {

-			List<Mapping> enumLiteralMappings = new ArrayList<Mapping>();

-			synchronized (enumLiteralMappings) {

-

-				for (Mapping mapping : getAllMappings(facadeGenModel)) {

-					if (mapping.getSpecificDomainElement() instanceof EEnumLiteral) {

-						if (mapping.getUmlElement() != TypesPackage.eINSTANCE.getBoolean() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getString() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getReal()

-								&& mapping.getUmlElement() != TypesPackage.eINSTANCE.getInteger() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getUnlimitedNatural()) {

-							enumLiteralMappings.add(mapping);

-						}

-					}

-				}

-			}

-			enumLiteralMappingsCache.put(facadeGenModel, enumLiteralMappings);

-		}

-		return enumLiteralMappingsCache.get(facadeGenModel);

-

-	}

-

-	/**

-	 * Gets all the feature mappings.

-	 *

-	 * @param facadeGenModel

-	 *            the facade GenModel

-	 * @return all mappings that map a feature

-	 */

-	public static synchronized List<? extends Mapping> getAllFeatureMappings(GenModel facadeGenModel) {

-

-		if (!featureMappingsCache.containsKey(facadeGenModel)) {

-

-			List<Mapping> featureMappings = new ArrayList<Mapping>();

-

-			for (Mapping mapping : getAllMappings(facadeGenModel)) {

-				if (!isExtensionStereotypePropertyFromFacade(mapping.getSpecificDomainElement(), facadeGenModel)) {

-					if (mapping.getSpecificDomainElement() instanceof EStructuralFeature) {

-

-						featureMappings.add(mapping);

-					}

-					if (mapping.getSpecificDomainElement() instanceof Property) {

-

-						if (((Property) mapping.getSpecificDomainElement()).getClass_() instanceof Stereotype) {

-							featureMappings.add(mapping);

-						}

-					}

-				}

-			}

-			featureMappingsCache.put(facadeGenModel, featureMappings);

-		}

-

-		return featureMappingsCache.get(facadeGenModel);

-

-	}

-

-	/**

-	 * Find UML metaElement.

-	 *

-	 * @param facadeMetaElement

-	 *            the facade metaElement

-	 * @param genModel

-	 *            the GenModel

-	 * @return the UML metaElement

-	 */

-	public static EObject findUMLMetaElement(EObject facadeMetaElement, GenModel genModel) {

-		String mappingModel = findMappingModel(genModel);

-		if (mappingModel != null) {

-

-			if (genModel.eResource() != null) {

-				if (genModel.eResource().getResourceSet() != null) {

-					ResourceSet resourceSet = genModel.eResource().getResourceSet();

-					EObject root = resourceSet.getResource(URI.createURI(mappingModel, true), true).getContents().get(0);

-

-					if (root != null) {

-						if (root instanceof FacadeMappping) {

-							FacadeMappping facadeMappping = (FacadeMappping) root;

-							for (Mapping mapping : facadeMappping.getMappings()) {

-								if (EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

-

-									return getUMLElement(mapping);

-

-

-								}

-							}

-						}

-					}

-				}

-			}

-

-

-

-		}

-

-		return null;

-	}

-

-	/**

-	 * Gets the FeatureAccessorName of a the UML feature from a mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @param genModel

-	 *            the GenModel

-	 * @return the UML feature from mapping

-	 */

-	public static String getUMLFeatureFromMapping(Mapping mapping, GenModel genModel) {

-		EObject UMLMetaElement = mapping.getUmlElement();

-

-		if (UMLMetaElement instanceof NamedElement) {

-

-			if (UMLMetaElement.eResource() != null) {

-				if (!UMLMetaElement.eResource().getContents().isEmpty()) {

-					EObject root = UMLMetaElement.eResource().getContents().get(0);

-					if (root instanceof Profile) {

-

-						GenModel profileGen = getGenModel(UMLMetaElement);

-						EObject umlMetaFeatureDefinition = ((Profile) root).getDefinition((NamedElement) UMLMetaElement);

-						if (umlMetaFeatureDefinition instanceof EStructuralFeature) {

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) profileGen).findGenFeature((EStructuralFeature) umlMetaFeatureDefinition).getFeatureAccessorName();

-						}

-

-					}

-				}

-			}

-

-

-		} else {

-

-			if (UMLMetaElement instanceof EStructuralFeature) {

-				if (UMLMetaElement != null) {

-					ResourceSet resourceSet = new ResourceSetImpl();

-					EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

-

-					if (umlGenModel != null) {

-						if (umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

-

-							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) umlGenModel).findGenFeature((EStructuralFeature) UMLMetaElement).getFeatureAccessorName();

-						}

-					}

-				}

-			}

-		}

-

-		return "FAILED_TO_FIND_MAPPED_UML_FEATURE"; //$NON-NLS-1$

-	}

-

-

-	/**

-	 * Gets the package path from mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @return the package path from mapping

-	 */

-	public static String getPackagePathFromMapping(Mapping mapping) {

-		EObject UMLMetaElement = getUMLElement(mapping);

-

-		return getPackagePathFromUML(UMLMetaElement);

-	}

-

-	/**

-	 * Gets the EPackage path from UML element mapped by a mapping.

-	 *

-	 * @param UMLMetaElement

-	 *            the UML metaElement

-	 * @return the EPackage path from UML

-	 */

-	public static String getPackagePathFromUML(EObject UMLMetaElement) {

-

-		EObject root = UMLMetaElement.eResource().getContents().get(0);

-		if (root instanceof Profile) {

-			Stereotype ePackageStereotype = ((Profile) root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

-			if (ePackageStereotype != null) {

-				Object packageName = ((Profile) root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

-				Object basePackage = ((Profile) root).getValue(ePackageStereotype, "basePackage"); //$NON-NLS-1$

-				if (packageName instanceof String && basePackage instanceof String) {

-					if (UMLMetaElement instanceof NamedElement) {

-						return basePackage + "." + packageName; //$NON-NLS-1$

-					}

-				}

-			}

-

-		} else {

-

-			return "org.eclipse.uml2.uml"; //$NON-NLS-1$

-

-		}

-

-		return "FAILED_TO_FIND_MAPPED_UML_PACKAGE_PATH"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets the full EPackage path from a mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @return the Epackage path

-	 */

-	public static String getUMLPackageName(Mapping mapping) {

-

-		EObject UMLMetaElement = getUMLElement(mapping);

-

-		EObject root = UMLMetaElement.eResource().getContents().get(0);

-		if (root instanceof Profile) {

-			Stereotype ePackageStereotype = ((Profile) root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

-			if (ePackageStereotype != null) {

-				Object packageName = ((Profile) root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

-				if (packageName instanceof String) {

-					if (UMLMetaElement instanceof NamedElement) {

-						return getPackagePathFromMapping(mapping) + "." + packageName + "Package"; //$NON-NLS-1$ //$NON-NLS-2$

-					}

-				}

-			}

-

-		} else {

-

-			return getPackagePathFromMapping(mapping) + ".UMLPackage"; //$NON-NLS-1$

-

-		}

-

-		return "FAILED_TO_FIND_MAPPED_UML_PACKAGE_NAME"; //$NON-NLS-1$

-	}

-

-

-	/**

-	 * Gets the UML accessorName from a mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @param genModel

-	 *            the GenModel

-	 * @return the UML accessorName

-	 */

-	public static String getUMLAccessorName(Mapping mapping, GenModel genModel) {

-

-		EObject UMLMetaElement = getUMLElement(mapping);

-

-		EObject root = UMLMetaElement.eResource().getContents().get(0);

-		if (root instanceof Profile) {

-

-			if (UMLMetaElement instanceof NamedElement) {

-				return ((NamedElement) UMLMetaElement).getName();

-			}

-

-		} else {

-

-			if (UMLMetaElement instanceof EClassifier) {

-

-				ResourceSet resourceSet = new ResourceSetImpl();

-				EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

-

-				if (umlGenModel != null) {

-					if (umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

-

-						return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel) umlGenModel).findGenClassifier((EClassifier) UMLMetaElement).getClassifierAccessorName();

-					}

-				}

-

-			}

-		}

-

-		return "FAILED_TO_FIND_MAPPED_UML_ACCESSOR_NAME"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets the ClassifierAccessorName from a mapping.

-	 *

-	 * @param genModel

-	 *            the GenModel

-	 * @param mapping

-	 *            the mapping

-	 * @return the ClassifierAccessorName

-	 */

-	public static String getClassifierAccessorName(GenModel genModel, Mapping mapping) {

-		return genModel.findGenClassifier((EClassifier) mapping.getSpecificDomainElement()).getClassifierAccessorName();

-	}

-

-	/**

-	 * Gets the FeatureAccessorName from a mapping.

-	 *

-	 * @param genModel

-	 *            the GenModel

-	 * @param mapping

-	 *            the mapping

-	 * @return the FeatureAccessorName

-	 */

-	public static String getFeatureAccessorName(GenModel genModel, Mapping mapping) {

-		return genModel.findGenFeature((EStructuralFeature) mapping.getSpecificDomainElement()).getFeatureAccessorName();

-	}

-

-	/**

-	 * Gets the UML meta element mapped to a facadeElement.

-	 *

-	 * @param facadeMetaElement

-	 *            the facade meta element

-	 * @param genModel

-	 *            the GenModel

-	 * @return the UML meta element

-	 */

-	public static String getUMLMetaElement(EObject facadeMetaElement, GenModel genModel) {

-

-		for (Mapping mapping : getAllMappings(genModel)) {

-			if (EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

-				EObject UMLMetaElement = getUMLElement(mapping);

-

-				if (UMLMetaElement instanceof ENamedElement) {

-					return ((ENamedElement) UMLMetaElement).getName();

-				} else if (UMLMetaElement instanceof NamedElement) {

-					return ((NamedElement) UMLMetaElement).getName();

-				}

-

-			}

-		}

-

-

-		return "FAILED_TO_FIND_MAPPED_UML_METACLASS"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets the UML factory.

-	 *

-	 * @param facadeMetaElement

-	 *            the facade meta element

-	 * @param genModel

-	 *            the GenModel

-	 * @return the UML factory

-	 */

-	public static String getUMLFactory(EObject facadeMetaElement, GenModel genModel) {

-

-		for (Mapping mapping : getAllMappings(genModel)) {

-			if (EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

-

-				EObject UMLMetaElement = getUMLElement(mapping);

-

-				if (UMLMetaElement != null) {

-					EObject root = UMLMetaElement.eResource().getContents().get(0);

-					if (root instanceof Profile) {

-						Stereotype ePackageStereotype = ((Profile) root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

-						if (ePackageStereotype != null) {

-							Object packageName = ((Profile) root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

-							if (packageName instanceof String) {

-								if (UMLMetaElement instanceof NamedElement) {

-									return getPackagePathFromUML(UMLMetaElement) + "." + packageName + "Factory"; //$NON-NLS-1$ //$NON-NLS-2$

-								}

-							}

-						}

-					} else {

-						return getPackagePathFromUML(UMLMetaElement) + ".UMLFactory"; //$NON-NLS-1$

-					}

-				}

-

-			}

-		}

-

-

-

-

-		return "FAILED_TO_FIND_MAPPED_UML_FACTORY"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets the appropriate qualified type name.

-	 *

-	 * @param genClassifier

-	 *            a genClassifier

-	 * @return the qualifiedType name

-	 */

-	public static String getAppropriateQualifiedTypeName(GenClassifier genClassifier) {

-		if (genClassifier instanceof GenClass) {

-

-			return ((GenClass) genClassifier).getQualifiedInterfaceName();

-

-		} else if (genClassifier instanceof GenDataType) {

-

-			return ((GenDataType) genClassifier).getQualifiedInstanceClassName();

-

-		} else {

-

-			return "FAILED_TO_FIND_QUALIFIED_TYPE_NAME"; //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Gets the UML enum element from mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @return the UML enum element from mapping

-	 */

-	public static String getUMLEnumElementFromMapping(Mapping mapping) {

-		if (mapping.getUmlElement() instanceof EEnumLiteral) {

-			return ((EEnumLiteral) mapping.getUmlElement()).getEEnum().getName() + ".get(" + ((EEnumLiteral) mapping.getUmlElement()).getValue() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

-		} else if (mapping.getUmlElement() instanceof EnumerationLiteral) {

-			return ((EnumerationLiteral) mapping.getUmlElement()).getEnumeration().getName() + ".get(\"" + ((EnumerationLiteral) mapping.getUmlElement()).getName() + "\")"; //$NON-NLS-1$ //$NON-NLS-2$

-		}

-

-		return "FAILED_TO_FIND_MAPPED_UML_ENUM_ELEMENT"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Gets the facade enum element from mapping.

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @return the facade enum element from the mapping

-	 */

-	public static String getFacadeEnumElementFromMapping(Mapping mapping) {

-		if (mapping.getUmlElement() instanceof EEnumLiteral) {

-			return ((EEnumLiteral) mapping.getUmlElement()).getEEnum().getName() + ".get(" + ((EEnumLiteral) mapping.getUmlElement()).getValue() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

-		} else if (mapping.getUmlElement() instanceof EnumerationLiteral) {

-			return ((EnumerationLiteral) mapping.getUmlElement()).getEnumeration().getName() + ".get(\"" + ((EnumerationLiteral) mapping.getUmlElement()).getName() + "\")"; //$NON-NLS-1$ //$NON-NLS-2$

-		}

-

-		return "FAILED_TO_FIND_MAPPED_FACADE_ENUM_ELEMENT"; //$NON-NLS-1$

-	}

-

-	/**

-	 * Checks if facade element represents a stereotype role for an extension

-	 *

-	 * @param facadeElement

-	 *            the facade element

-	 * @param genModel

-	 *            the GenModel

-	 * @return true, if facade element represents a stereotype role for an extension

-	 */

-	protected static boolean isExtensionStereotypePropertyFromFacade(EObject facadeElement, GenModel genModel) {

-		EObject umlElement = findUMLMetaElement(facadeElement, genModel);

-

-		if (umlElement instanceof Property) {

-			if (((Property) umlElement).getAssociation() instanceof Extension) {

-				if (((Property) umlElement).getName().startsWith(Extension.STEREOTYPE_ROLE_PREFIX)) {

-					return Boolean.TRUE;

-				}

-

-			}

-		}

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Checks if is extention stereotype property.

-	 *

-	 * @param genFeature

-	 *            the gen feature

-	 * @return true, if is extention stereotype property

-	 */

-	public static boolean isExtentionStereotypeProperty(GenFeature genFeature) {

-

-

-		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

-

-		if (umlElement instanceof Property) {

-			if (((Property) umlElement).getAssociation() instanceof Extension) {

-				if (((Property) umlElement).getName().startsWith(Extension.STEREOTYPE_ROLE_PREFIX)) {

-					return Boolean.TRUE;

-				}

-

-			}

-		}

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Checks if is extension property.

-	 *

-	 * @param genFeature

-	 *            the gen feature

-	 * @return true, if is extension property

-	 */

-	public static boolean isExtensionProperty(GenFeature genFeature) {

-		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

-

-		if (umlElement instanceof Property) {

-			if (((Property) umlElement).getAssociation() instanceof Extension) {

-

-				return Boolean.TRUE;

-			}

-		}

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Checks if is stereotype property.

-	 *

-	 * @param genFeature

-	 *            the gen feature

-	 * @return true, if is stereotype property

-	 */

-	public static boolean isStereotypeProperty(GenFeature genFeature) {

-		EClass ecoreClass = genFeature.getGenClass().getEcoreClass();

-

-		boolean isAppropriateMapping = false;

-		for (Mapping mapping : getAllMappings(genFeature.getGenModel())) {

-			if (EcoreUtil.equals(ecoreClass, mapping.getSpecificDomainElement())) {

-				if (mapping instanceof StereotypedMapping) {

-					if (((StereotypedMapping) mapping).getKind() != ExtensionDefinitionKind.ASSOCIATION) {

-						isAppropriateMapping = true;

-					}

-				}

-			}

-		}

-

-		if (isAppropriateMapping) {

-			EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

-

-			if (umlElement instanceof Property) {

-				if (((Property) umlElement).getClass_() instanceof Stereotype) {

-					if (!isExtensionProperty(genFeature)) {

-						return Boolean.TRUE;

-					}

-				}

-			}

-		}

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Gets the stereotype qualified name.

-	 *

-	 * @param genFeature

-	 *            the gen feature

-	 * @return the stereotype qualified name

-	 */

-	public static String getStereotypeQualifiedName(GenFeature genFeature) {

-		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

-

-		if (umlElement instanceof Property) {

-			if (((Property) umlElement).getClass_() instanceof Stereotype) {

-				return ((Property) umlElement).getClass_().getQualifiedName();

-			}

-		}

-		return "FAILED_TO_FIND_STEREOTYPE_QUALIFIEDNAME"; //$NON-NLS-1$

-	}

-

-

-

-	/**

-	 * Gets the stereotyped mappings.

-	 *

-	 * @param genModel

-	 *            the GenModel

-	 * @return the stereotyped mappings

-	 */

-	public static synchronized List<StereotypedMapping> getStereotypedMappings(GenModel genModel) {

-

-		if (!stereotypedMappingsCache.containsKey(genModel)) {

-

-			List<StereotypedMapping> stereotypedMappings = new ArrayList<StereotypedMapping>();

-			for (Mapping mapping : getAllMappings(genModel)) {

-				if (mapping instanceof StereotypedMapping) {

-					stereotypedMappings.add((StereotypedMapping) mapping);

-				}

-			}

-

-			stereotypedMappingsCache.put(genModel, stereotypedMappings);

-		}

-

-		return stereotypedMappingsCache.get(genModel);

-	}

-

-	/**

-	 * Generate the wrapper for a mapping considering possible application of stereotype combinations

-	 *

-	 * @param mapping

-	 *            the mapping

-	 * @param genModel

-	 *            the GenModel

-	 * @param genPackage

-	 *            the gen package

-	 * @return the corresponding stereotype mapping

-	 */

-	public static String getCorrespondingStereotypeMapping(org.eclipse.papyrus.facademapping.Mapping mapping, GenModel genModel, GenPackage genPackage) {

-		String result = ""; //$NON-NLS-1$

-

-		if (!(mapping instanceof StereotypedMapping)) {

-

-			List<StereotypedMapping> correspondingStereotypeMappings = new ArrayList<StereotypedMapping>();

-			List<StereotypedMapping> correspondingAssocationStereotypeMappings = new ArrayList<StereotypedMapping>();

-

-			for (Mapping toProcessMapping : getStereotypedMappings(genModel)) {

-

-				if (mapping != toProcessMapping) {

-

-					boolean isAbstract = false;

-					EList<EObject> stereos = ((StereotypedMapping) toProcessMapping).getAppliedStereotypes();

-					for (EObject stereo : stereos) {

-						if (stereo instanceof Stereotype) {

-							if (((Stereotype) stereo).isAbstract()) {

-								isAbstract = true;

-							}

-						}

-					}

-					if (!isAbstract) {

-

-						if (((StereotypedMapping) toProcessMapping).getKind() == ExtensionDefinitionKind.GENERALIZATION || ((StereotypedMapping) toProcessMapping).getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-							if (toProcessMapping.getUmlElement() == mapping.getUmlElement()) {

-								correspondingStereotypeMappings.add((StereotypedMapping) toProcessMapping);

-							}

-						} else {

-							if (mapping.getUmlElement() instanceof EClass) {

-								List<EObject> candidates = new ArrayList<EObject>();

-								candidates.add(mapping.getUmlElement());

-								candidates.addAll(((EClass) mapping.getUmlElement()).getEAllSuperTypes());

-

-								if (candidates.contains(toProcessMapping.getUmlElement())) {

-									correspondingAssocationStereotypeMappings.add((StereotypedMapping) toProcessMapping);

-								}

-							}

-						}

-					}

-				}

-			}

-

-			for (StereotypedMapping correspondingStereotypeMapping : correspondingStereotypeMappings) {

-				if (correspondingStereotypeMapping.getSpecificDomainElement() instanceof ENamedElement) {

-

-					String name = ((ENamedElement) correspondingStereotypeMapping.getSpecificDomainElement()).getName().toLowerCase();

-

-					// Single stereotype

-					List<Stereotype> combination = new ArrayList<Stereotype>();

-					combination.addAll((Collection<? extends Stereotype>) correspondingStereotypeMapping.getAppliedStereotypes());

-					result += addWrappingStereotypeMapping(combination, name, genPackage, genModel, correspondingStereotypeMapping);

-

-					// Create combination with association stereo

-					if (!correspondingAssocationStereotypeMappings.isEmpty()) {

-

-						for (int k = 1; k <= correspondingAssocationStereotypeMappings.size(); k++) {

-							CombinationGenerator combinaisonGenerator = new CombinationGenerator(correspondingAssocationStereotypeMappings.size(), k);

-

-							// Process each combination

-							while (combinaisonGenerator.hasMore()) {

-								int[] indices = combinaisonGenerator.getNext();

-

-								// Single stereotype first

-								combination = new ArrayList<Stereotype>();

-								combination.addAll((Collection<? extends Stereotype>) correspondingStereotypeMapping.getAppliedStereotypes());

-								name = ((ENamedElement) correspondingStereotypeMapping.getSpecificDomainElement()).getName().toLowerCase();

-

-								for (int i = 0; i < indices.length; i++) {

-									combination.addAll((Collection<? extends Stereotype>) correspondingAssocationStereotypeMappings.get(indices[i]).getAppliedStereotypes());

-

-									if (correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement() instanceof ENamedElement) {

-										name += "_" + ((ENamedElement) correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement()).getName().toLowerCase(); //$NON-NLS-1$

-									} else {

-										FacadeCodeGenPlugin.log.warn(Messages.FacadeCodegenUtils_48 + correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement());

-									}

-								}

-								result += addWrappingStereotypeMapping(combination, name, genPackage, genModel, correspondingStereotypeMapping);

-							}

-						}

-					}

-

-				} else {

-					FacadeCodeGenPlugin.log.warn(Messages.FacadeCodegenUtils_49 + correspondingStereotypeMapping.getSpecificDomainElement());

-				}

-

-			}

-

-		}

-

-		return result;

-

-	}

-

-	/**

-	 * Generate the actual text for a wrapping of a combination of stereotype application

-	 *

-	 * @param combination

-	 *            the combination

-	 * @param name

-	 *            the name

-	 * @param genPackage

-	 *            the gen package

-	 * @param genModel

-	 *            the GenModel

-	 * @param correspondingStereotypeMapping

-	 *            the corresponding stereotype mapping

-	 * @return the string

-	 */

-	protected static String addWrappingStereotypeMapping(List<Stereotype> combination, String name, GenPackage genPackage, GenModel genModel, StereotypedMapping correspondingStereotypeMapping) {

-

-		String result = ""; //$NON-NLS-1$

-

-		result += "java.util.List<org.eclipse.uml2.uml.Stereotype> " + name + "_Stereotypes = new java.util.ArrayList<org.eclipse.uml2.uml.Stereotype>();\n"; //$NON-NLS-1$ //$NON-NLS-2$

-

-		result += addStereotypes(combination, name);

-		result += "if(((org.eclipse.uml2.uml.Element)umlElement).getAppliedStereotypes().size() ==  " + name + "_Stereotypes.size()) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

-		result += "if(((org.eclipse.uml2.uml.Element)umlElement).getAppliedStereotypes().containsAll(" + name + "_Stereotypes)) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

-		result += "return " + genPackage.getImportedPackageInterfaceName() + ".eINSTANCE.get" + getClassifierAccessorName(genModel, correspondingStereotypeMapping) + "();\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		result += "}\n"; //$NON-NLS-1$

-		result += "}\n"; //$NON-NLS-1$

-		for (int i = 0; i < combination.size(); i++) {

-			result += "}\n"; //$NON-NLS-1$

-		}

-

-		return result;

-

-	}

-

-	/**

-	 * Generate the text for the combination of stereotype application

-	 *

-	 * @param combination

-	 *            the combination

-	 * @param name

-	 *            the name

-	 * @return the string

-	 */

-	protected static String addStereotypes(List<Stereotype> combination, String name) {

-		String result = ""; //$NON-NLS-1$

-

-		for (EObject stereotype : combination) {

-			if (stereotype instanceof Stereotype) {

-				result += "if(((org.eclipse.uml2.uml.Element)umlElement).getApplicableStereotype(\"" + ((Stereotype) stereotype).getQualifiedName() + "\") != null) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

-				result += name + "_Stereotypes.add(((org.eclipse.uml2.uml.Element)umlElement).getApplicableStereotype(\"" + ((Stereotype) stereotype).getQualifiedName() + "\"));\n"; //$NON-NLS-1$ //$NON-NLS-2$

-

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Checks if is a list of primitive types.

-	 *

-	 * @param genFeature

-	 *            the genFeature

-	 * @return true, if is list of primitive types

-	 */

-	public static boolean isPrimtiveList(GenTypedElement genTypedElement) {

-		if (CodeGenUtil.isJavaDefaultType(genTypedElement.getListItemType())) {

-			return Boolean.TRUE;

-		}

-

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Checks if is primitive type.

-	 *

-	 * @param genFeature

-	 *            the genFeature

-	 * @return true, if is primitive type

-	 */

-	public static boolean isPrimitive(GenTypedElement genTypedElement) {

-		if (isJavaDefaultType(genTypedElement.getType())) {

-			return Boolean.TRUE;

-		}

-

-		if (isEcoreDefaultType(genTypedElement.getType())) {

-			return Boolean.TRUE;

-		}

-

-		if (genTypedElement.getType().startsWith("java.util.Map<")) {

-			return Boolean.TRUE;

-		}

-

-		return Boolean.FALSE;

-	}

-

-	/**

-	 * Tests whether the given string is the name of a primitive or java.lang type.

-	 */

-	protected static boolean isEcoreDefaultType(String s) {

-		return getEcoreDefaultTypes().contains(s);

-	}

-

-	/**

-	 * Tests whether the given string is the name of a primitive or java.lang type.

-	 */

-	protected static boolean isJavaDefaultType(String s) {

-		return getJavaDefaultTypes().contains(s);

-	}

-

-	/**

-	 * Returns the names of the ecore types

-	 */

-	public static synchronized Set<String> getEcoreDefaultTypes() {

-		if (ecoreDefaultTypes == null) {

-			Set<String> result = new HashSet<String>(100);

-			result.add("org.eclipse.emf.ecore.EAnnotation");

-			result.add("org.eclipse.emf.ecore.EAttribute");

-			result.add("org.eclipse.emf.ecore.EClass");

-			result.add("org.eclipse.emf.ecore.EClassifier");

-			result.add("org.eclipse.emf.ecore.EcoreFactory");

-			result.add("org.eclipse.emf.ecore.EcorePackage");

-			result.add("org.eclipse.emf.ecore.EDataType");

-			result.add("org.eclipse.emf.ecore.EEnum");

-			result.add("org.eclipse.emf.ecore.EEnumLiteral");

-			result.add("org.eclipse.emf.ecore.EFactory");

-			result.add("org.eclipse.emf.ecore.EGenericType");

-			result.add("org.eclipse.emf.ecore.EModelElement");

-			result.add("org.eclipse.emf.ecore.ENamedElement");

-			result.add("org.eclipse.emf.ecore.EObject");

-			result.add("org.eclipse.emf.ecore.EOperation");

-			result.add("org.eclipse.emf.ecore.EPackage");

-			result.add("org.eclipse.emf.ecore.EParameter");

-			result.add("org.eclipse.emf.ecore.EReference");

-			result.add("org.eclipse.emf.ecore.EStructuralFeature");

-			result.add("org.eclipse.emf.ecore.ETypedElement");

-			result.add("org.eclipse.emf.ecore.ETypeParameter");

-			result.add("org.eclipse.emf.ecore.EValidator");

-			result.add("org.eclipse.emf.ecore.InternalEObject");

-

-			// ypes not directly EMF but used by EMF

-			result.add("org.eclipse.emf.common.util.DiagnosticChain");

-

-

-			ecoreDefaultTypes = Collections.unmodifiableSet(result);

-		}

-		return ecoreDefaultTypes;

-	}

-

-	/**

-	 * Returns the names of the primitives and types

-	 */

-	public static synchronized Set<String> getJavaDefaultTypes() {

-		if (javaDefaultTypes == null) {

-			Set<String> result = new HashSet<String>(100);

-			result.add("java.lang.AbstractMethodError");

-			result.add("java.lang.ArithmeticException");

-			result.add("java.lang.ArrayIndexOutOfBoundsException");

-			result.add("java.lang.ArrayStoreException");

-			result.add("java.lang.Boolean");

-			result.add("java.lang.Byte");

-			result.add("java.lang.Character");

-			result.add("java.lang.Class");

-			result.add("java.lang.ClassCastException");

-			result.add("java.lang.ClassCircularityError");

-			result.add("java.lang.ClassFormatError");

-			result.add("java.lang.ClassLoader");

-			result.add("java.lang.ClassNotFoundException");

-			result.add("java.lang.CloneNotSupportedException");

-			result.add("java.lang.Cloneable");

-			result.add("java.lang.Comparable");

-			result.add("java.lang.Compiler");

-			result.add("java.lang.Double");

-			result.add("java.lang.Deprecated");

-			result.add("java.lang.Enum");

-			result.add("java.lang.Error");

-			result.add("java.lang.Exception");

-			result.add("java.lang.ExceptionInInitializerError");

-			result.add("java.lang.Float");

-			result.add("java.lang.FloatingDecimal");

-			result.add("java.lang.IllegalAccessError");

-			result.add("java.lang.IllegalAccessException");

-			result.add("java.lang.IllegalArgumentException");

-			result.add("java.lang.IllegalMonitorStateException");

-			result.add("java.lang.IllegalStateException");

-			result.add("java.lang.IllegalThreadStateException");

-			result.add("java.lang.IncompatibleClassChangeError");

-			result.add("java.lang.IndexOutOfBoundsException");

-			result.add("java.lang.InheritableThreadLocal");

-			result.add("java.lang.InstantiationError");

-			result.add("java.lang.InstantiationException");

-			result.add("java.lang.Integer");

-			result.add("java.lang.InternalError");

-			result.add("java.lang.InterruptedException");

-			result.add("java.lang.LinkageError");

-			result.add("java.lang.Long");

-			result.add("java.lang.Math");

-			result.add("java.lang.NegativeArraySizeException");

-			result.add("java.lang.NoClassDefFoundError");

-			result.add("java.lang.NoSuchFieldError");

-			result.add("java.lang.NoSuchFieldException");

-			result.add("java.lang.NoSuchMethodError");

-			result.add("java.lang.NoSuchMethodException");

-			result.add("java.lang.NullPointerException");

-			result.add("java.lang.Number");

-			result.add("java.lang.NumberFormatException");

-			result.add("java.lang.Object");

-			result.add("java.lang.Override");

-			result.add("java.lang.OutOfMemoryError");

-			result.add("java.lang.Package");

-			result.add("java.lang.Process");

-			result.add("java.lang.Runnable");

-			result.add("java.lang.Runtime");

-			result.add("java.lang.RuntimeException");

-			result.add("java.lang.RuntimePermission");

-			result.add("java.lang.SecurityException");

-			result.add("java.lang.SecurityManager");

-			result.add("java.lang.Short");

-			result.add("java.lang.StackOverflowError");

-			result.add("java.lang.String");

-			result.add("java.lang.StringBuffer");

-			result.add("java.lang.StringBuilder");

-			result.add("java.lang.StringIndexOutOfBoundsException");

-			result.add("java.lang.SuppressWarnings");

-			result.add("java.lang.System");

-			result.add("java.lang.Thread");

-			result.add("java.lang.ThreadDeath");

-			result.add("java.lang.ThreadGroup");

-			result.add("java.lang.ThreadLocal");

-			result.add("java.lang.Throwable");

-			result.add("java.lang.UnknownError");

-			result.add("java.lang.UnsatisfiedLinkError");

-			result.add("java.lang.UnsupportedClassVersionError");

-			result.add("java.lang.UnsupportedOperationException");

-			result.add("java.lang.VerifyError");

-			result.add("java.lang.VirtualMachineError");

-			result.add("Void");

-			result.add("void");

-			result.add("boolean");

-			result.add("byte");

-			result.add("char");

-			result.add("double");

-			result.add("float");

-			result.add("int");

-			result.add("long");

-			result.add("short");

-			javaDefaultTypes = Collections.unmodifiableSet(result);

-		}

-		return javaDefaultTypes;

-	}

-

-	/**

-	 * Copy the original ecore metamodel in the impl source package

-	 *

-	 * @param genPackage

-	 *            the gen package

-	 */

-	public static void copyEcore(GenPackage genPackage) {

-

-

-		GenModel genModel = genPackage.getGenModel();

-		EModelElement ecoreModelElement = genPackage.getEcoreModelElement();

-		if (ecoreModelElement != null) {

-

-			URI originalURI = ecoreModelElement.eResource().getURI();

-			String modelDirectory = genModel.getModelDirectory();

-			String implPackage = genPackage.getClassPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$

-			if (!implPackage.startsWith("/") && !modelDirectory.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$

-				implPackage = "/" + implPackage; //$NON-NLS-1$

-			}

-			String filePath = modelDirectory + implPackage;

-			if (!filePath.endsWith("/")) { //$NON-NLS-1$

-				filePath += "/"; //$NON-NLS-1$

-			}

-			filePath += originalURI.lastSegment();

-			URI destURI = URI.createURI("platform:/resource" + filePath, true); //$NON-NLS-1$

-			String dest = destURI.toPlatformString(true);

-

-			try {

-

-				if (originalURI.isPlatformResource()) {

-					String platformString = originalURI.toPlatformString(true);

-					IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(platformString);

-					if (resource instanceof IFile) {

-

-						IPath destPath = new Path(dest);

-						if (destPath.segmentCount() >= 2) {

-							IFile destFolder = resource.getProject().getFile(destPath.removeLastSegments(1).removeFirstSegments(1));

-							IFile destFile = resource.getProject().getFile(destPath.removeFirstSegments(1));

-

-							File destFolderFile = destFolder.getLocation().toFile();

-							File destFileFile = destFile.getLocation().toFile();

-							destFolderFile.mkdirs();

-							destFileFile.createNewFile();

-							Files.copy(resource.getLocation().toFile().toPath(), destFileFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

-

-						}

-

-					}

-				}

-			} catch (IOException e) {

-				e.printStackTrace();

-			}

-

-

-

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java
deleted file mode 100644
index dbd66a3108c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.codegen.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;

-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;

-import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel;

-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

-import org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl;

-import org.eclipse.emf.codegen.util.CodeGenUtil;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EGenericType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-public class WrappingListUtils {

-

-	private static final String UNSUPPORTED_LIST_CONSTRUCTOR = "UNSUPPORTED_LIST_CONSTRUCTOR"; //$NON-NLS-1$

-

-	/**

-	 * Gets the list of genFeatures that are subsetted by the genFeature.

-	 *

-	 * @param genFeature

-	 *            the genFeature

-	 * @return the list of subsetted genFeatures

-	 */

-	protected static List<GenFeature> getSubsetReferenceGenFeature(GenFeature genFeature) {

-		List<GenFeature> result = new ArrayList<GenFeature>();

-		EStructuralFeature ecoreFeature = genFeature.getEcoreFeature();

-		if (ecoreFeature != null) {

-			EAnnotation annotation = ecoreFeature.getEAnnotation("subsets"); //$NON-NLS-1$

-			if (annotation != null) {

-				EList<EObject> references = annotation.getReferences();

-				for (EObject ref : references) {

-

-					if (ref instanceof EReference) {

-						GenFeature refGenFeature = genFeature.getGenModel().findGenFeature((EStructuralFeature) ref);

-						result.add(refGenFeature);

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-

-	/**

-	 * Gets the wrapping list constructor.

-	 *

-	 * @param genClass

-	 *            the gen class

-	 * @param genFeature

-	 *            the gen feature

-	 * @param typeArgument

-	 *            the type argument

-	 * @return the wrapping list constructor

-	 */

-	public static String getWrappingListConstructor(GenClass genClass, GenFeature genFeature, String typeArgument) {

-

-		boolean isJava5 = isJDK50(genClass.getGenModel());

-		if (genClass instanceof GenClassImpl) {

-

-			GenClassImpl genClassImpl = (GenClassImpl) genClass;

-			StringBuffer sb = new StringBuffer();

-

-			String unsettable = genFeature.isUnsettable() ? ".Unsettable" : ""; //$NON-NLS-1$ //$NON-NLS-2$

-			String offsetCorrectionField = genClassImpl.hasOffsetCorrection() ? " + " + genClassImpl.getOffsetCorrectionField(null) : ""; //$NON-NLS-1$ //$NON-NLS-2$

-

-

-			if (genFeature.isMapType()) {

-				sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_MapType"); //$NON-NLS-1$

-				// GenClass mapGenClass = genFeature.getMapEntryTypeGenClass();

-				// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EcoreEMap"));

-				// sb.append(unsettable);

-				// if(isJava5) {

-				// sb.append('<');

-				// sb.append(genFeature.getImportedMapKeyType(genClassImpl));

-				// sb.append(',');

-				// sb.append(genFeature.getImportedMapValueType(genClassImpl));

-				// sb.append('>');

-				// }

-				// sb.append("(");

-				// sb.append(mapGenClass.getQualifiedClassifierAccessor());

-				// sb.append(", ");

-				// sb.append(genFeature.getImportedMapEntryType());

-				// sb.append(".class, this, ");

-				// sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-				// sb.append(offsetCorrectionField);

-				// if(genFeature.isBidirectional() && genClassImpl.getGenModel().getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF27_VALUE) {

-				// sb.append(", ");

-				// sb.append(genFeature.getReverse().getGenClass().getQualifiedFeatureID(genFeature.getReverse()));

-				// }

-				// sb.append(")");

-			} else if (genFeature.isFeatureMapType()) {

-				sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_FeatureMapType"); //$NON-NLS-1$

-				// if(genFeature.isWrappedFeatureMapType()) {

-				// sb.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

-				// sb.append("(new ");

-				// }

-				// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.BasicFeatureMap"));

-				// sb.append("(this, ");

-				// sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-				// sb.append(offsetCorrectionField);

-				// sb.append(")");

-				// if(genFeature.isWrappedFeatureMapType()) {

-				// sb.append(")");

-				// }

-			} else {

-				EGenericType eGenericType = genFeature.getEcoreFeature().getEGenericType();

-				if (genClassImpl.getGenModel().isSuppressNotification()) {

-

-					sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Generic"); //$NON-NLS-1$

-

-					// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.BasicInternalEList"));

-					// if(genClassImpl.getGenModel().getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF28_VALUE) {

-					// sb.append(unsettable);

-					// }

-					// if(isJava5) {

-					// sb.append('<');

-					// sb.append(genFeature.getListItemType(genClassImpl));

-					// sb.append('>');

-					// }

-					// sb.append("(");

-					// sb.append(typeArgument);

-					// sb.append(".class)");

-				} else if (genFeature.isEffectiveContains()) {

-					if (genFeature.isBidirectional()) {

-						GenFeature reverseFeature = genFeature.getReverse();

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectContainmentWithInverseEList")); //$NON-NLS-1$

-						} else {

-							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentWithInverseEList")); //$NON-NLS-1$

-						}

-						sb.append(unsettable);

-						if (genFeature.isResolveProxies()) {

-							// sb.append(".Resolving");

-							sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Resolving"); //$NON-NLS-1$

-						}

-						if (isJava5) {

-							sb.append('<');

-							sb.append(genFeature.getListItemType(genClassImpl));

-							sb.append('>');

-						}

-						sb.append("("); //$NON-NLS-1$

-						sb.append(typeArgument);

-						sb.append(".class, this, "); //$NON-NLS-1$

-						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-						sb.append(offsetCorrectionField);

-						sb.append(", "); //$NON-NLS-1$

-						sb.append(reverseFeature.getGenClass().getQualifiedFeatureID(reverseFeature));

-						if (reverseFeature.getGenClass().hasOffsetCorrection()) {

-							sb.append(" + "); //$NON-NLS-1$

-							sb.append(genClassImpl.getOffsetCorrectionField(genFeature));

-						}

-						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							for (GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

-								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-							}

-						}

-						sb.append(")"); //$NON-NLS-1$

-					} else {

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectContainmentEList")); //$NON-NLS-1$

-						} else {

-							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentEList")); //$NON-NLS-1$

-						}

-						sb.append(unsettable);

-						if (genFeature.isResolveProxies()) {

-							// sb.append(".Resolving");

-							sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Resolving"); //$NON-NLS-1$

-						}

-						if (isJava5) {

-							sb.append('<');

-							sb.append(genFeature.getListItemType(genClassImpl));

-							sb.append('>');

-						}

-						sb.append("("); //$NON-NLS-1$

-						sb.append(typeArgument);

-						sb.append(".class, this, "); //$NON-NLS-1$

-						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-						sb.append(offsetCorrectionField);

-						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							for (GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

-								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-							}

-						}

-						sb.append(")"); //$NON-NLS-1$

-					}

-				} else if (genFeature.isReferenceType()) {

-					if (genFeature.isBidirectional()) {

-						GenFeature reverseFeature = genFeature.getReverse();

-						if (genFeature.isResolveProxies()) {

-							// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList"));

-							if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectWithInverseEList")); //$NON-NLS-1$

-							} else {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList")); //$NON-NLS-1$

-							}

-						} else {

-							if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectWithInverseEList")); //$NON-NLS-1$

-							} else {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList")); //$NON-NLS-1$

-							}

-						}

-						sb.append(unsettable);

-						if (reverseFeature.isListType()) {

-							if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-								sb.append(".WrappingSubsetManyInverse"); //$NON-NLS-1$

-							} else {

-								sb.append(".WrappingManyInverse"); //$NON-NLS-1$

-							}

-						}

-						if (isJava5) {

-							sb.append('<');

-							sb.append(genFeature.getListItemType(genClassImpl));

-							sb.append('>');

-						}

-						sb.append("("); //$NON-NLS-1$

-						sb.append(typeArgument);

-						sb.append(".class, this, "); //$NON-NLS-1$

-						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-						sb.append(offsetCorrectionField);

-						sb.append(", "); //$NON-NLS-1$

-						sb.append(reverseFeature.getGenClass().getQualifiedFeatureID(reverseFeature));

-						if (reverseFeature.getGenClass().hasOffsetCorrection()) {

-							sb.append(" + "); //$NON-NLS-1$

-							sb.append(genClassImpl.getOffsetCorrectionField(genFeature));

-						}

-						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							for (GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

-								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-							}

-						}

-						sb.append(")"); //$NON-NLS-1$

-					} else {

-						if (genFeature.isResolveProxies()) {

-							// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EObjectResolvingEList"));

-							if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectEList")); //$NON-NLS-1$

-							} else {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList")); //$NON-NLS-1$

-							}

-						} else {

-							if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectEList")); //$NON-NLS-1$

-							} else {

-								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList")); //$NON-NLS-1$

-							}

-						}

-						sb.append(unsettable);

-						if (isJava5) {

-							sb.append('<');

-							sb.append(genFeature.getListItemType(genClassImpl));

-							sb.append('>');

-						}

-						sb.append("("); //$NON-NLS-1$

-						sb.append(typeArgument);

-						sb.append(".class, this, "); //$NON-NLS-1$

-						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-						sb.append(offsetCorrectionField);

-						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

-						if (!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

-							for (GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

-								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-							}

-						}

-						sb.append(")"); //$NON-NLS-1$

-					}

-				} else { // data type

-					if (genFeature.isUnique()) {

-						// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EDataTypeUniqueEList"));

-						sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_UniqueDatatype"); //$NON-NLS-1$

-					} else {

-						// sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EDataTypeEList"));

-						sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_NotUniqueDatatype"); //$NON-NLS-1$

-					}

-					sb.append(unsettable);

-					if (isJava5) {

-						sb.append('<');

-						sb.append(genFeature.getListItemType(genClassImpl));

-						sb.append('>');

-					}

-					sb.append("("); //$NON-NLS-1$

-					sb.append(isPrimitiveType(eGenericType.getERawType()) ? genFeature.getRawListItemType() : typeArgument);

-					sb.append(".class, this, "); //$NON-NLS-1$

-					sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

-					sb.append(offsetCorrectionField);

-					sb.append(")"); //$NON-NLS-1$

-				}

-			}

-			return sb.toString();

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * Checks if the genModel is defined as JDK50 complianceLevel.

-	 *

-	 * @param genModel

-	 *            the genModel

-	 * @return true, if the genModel is defined as JDK50 complianceLevel.

-	 */

-	public static boolean isJDK50(GenModel genModel) {

-		if (genModel != null && genModel.getComplianceLevel() != null) {

-			return genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if is primitive type.

-	 *

-	 * @param eType

-	 *            the eType

-	 * @return true, if is primitive type

-	 */

-	static public boolean isPrimitiveType(EClassifier eType) {

-		return eType != null && CodeGenUtil.isJavaPrimitiveType(eType.getInstanceClassName());

-	}

-

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project
deleted file mode 100644
index 36c4dfa1de0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade.definition.editor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 54e493c07c9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index b27a2e5e6fe..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.jface.text,

- org.eclipse.ui.editors,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.papyrus.facade.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.facade.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0"

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade.definition.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Bundle-Vendor: %providerName

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/about.html b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties
deleted file mode 100644
index b225fba7950..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = plugin.xml,\

-               META-INF/,\

-               .,\

-               icons/,\

-               about.html,\

-               plugin.properties

-src.includes = about.html
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png
deleted file mode 100644
index 0ed33de4bbd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png
deleted file mode 100644
index 2e8f27c7c84..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif
deleted file mode 100644
index 9cacb96dca9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png
deleted file mode 100644
index fd48fba83ae..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png
deleted file mode 100644
index 779a7b8b123..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png
deleted file mode 100644
index 48b3d9712e4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png
deleted file mode 100644
index 792ab41bdfd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png
deleted file mode 100644
index 2bc0fe5703e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png
deleted file mode 100644
index 0d00d0dcbf0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png
deleted file mode 100644
index d68ef99ac8d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png
deleted file mode 100644
index 1690a3eab3b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png
deleted file mode 100644
index 228231008ee..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png
deleted file mode 100644
index 007e8a4dadc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif
deleted file mode 100644
index 5f17b937e9f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif
deleted file mode 100644
index 4da4be6653b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif
deleted file mode 100644
index 5d31048451a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif
deleted file mode 100644
index 343d086340b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif
deleted file mode 100644
index 7bb44f59cc8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif
deleted file mode 100644
index 2b8da630d85..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif
deleted file mode 100644
index 60824bba116..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif
deleted file mode 100644
index bef08f3cc15..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif
deleted file mode 100644
index 88cdf2ad850..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.properties
deleted file mode 100644
index fa97269191d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#

-

-pluginName = Facade Definition Editor (Incubation)

-providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml
deleted file mode 100644
index bc95e9e6f16..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-   <extension

-         point="org.eclipse.ui.editors">

-      <editor

-            name="Facade Definition Editor"

-            extensions="facade"

-            icon="icons/facade.png"

-            contributorClass="org.eclipse.papyrus.facade.presentation.FacadeActionBarContributor"

-            class="org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor"

-            id="FacadeDefinitionEditor">

-      </editor>

-   </extension>

-
-</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/pom.xml
deleted file mode 100644
index d04c23e82ad..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade.definition.editor</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.2.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java
deleted file mode 100644
index e157bc93fbb..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package com.swtdesigner;
-
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
- * etc.
- *
- * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
- * operating system resources managed by cached objects when those objects and OS resources are no longer
- * needed (e.g. on application shutdown)
- *
- * This class may be freely distributed as part of any application or plugin.
- * <p>
- * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
- * All Rights Reserved
- *
- * @author scheglov_ke
- * @author Dan Rubel
- */
-public class ResourceManager extends SWTResourceManager {
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Image
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<ImageDescriptor, Image>();
-
-	/**
-	 * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
-	 * class.
-	 *
-	 * @param clazz
-	 *            the {@link Class} relative to which to find the image descriptor.
-	 * @param path
-	 *            the path to the image file.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 */
-	public static ImageDescriptor getImageDescriptor(Class<?> clazz, String path) {
-		return ImageDescriptor.createFromFile(clazz, path);
-	}
-
-	/**
-	 * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-	 *
-	 * @param path
-	 *            the path to the image file.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		try {
-			return ImageDescriptor.createFromURL(new File(path).toURI().toURL());
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-	 *
-	 * @param descriptor
-	 *            the {@link ImageDescriptor} for the {@link Image}.
-	 * @return the {@link Image} based on the specified {@link ImageDescriptor}.
-	 */
-	public static Image getImage(ImageDescriptor descriptor) {
-		if (descriptor == null) {
-			return null;
-		}
-		Image image = m_descriptorImageMap.get(descriptor);
-		if (image == null) {
-			image = descriptor.createImage();
-			m_descriptorImageMap.put(descriptor, image);
-		}
-		return image;
-	}
-
-	/**
-	 * Maps images to decorated images.
-	 */
-	@SuppressWarnings("unchecked")
-	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
-
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 *
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated.
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image.
-	 * @return {@link Image} The resulting decorated image.
-	 */
-	public static Image decorateImage(Image baseImage, Image decorator) {
-		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
-	}
-
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 *
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated.
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image.
-	 * @param corner
-	 *            the corner to place decorator image.
-	 * @return the resulting decorated {@link Image}.
-	 */
-	public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
-		if (corner <= 0 || corner >= LAST_CORNER_KEY) {
-			throw new IllegalArgumentException("Wrong decorate corner");
-		}
-		Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
-		if (cornerDecoratedImageMap == null) {
-			cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
-			m_decoratedImageMap[corner] = cornerDecoratedImageMap;
-		}
-		Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
-		if (decoratedMap == null) {
-			decoratedMap = new HashMap<Image, Image>();
-			cornerDecoratedImageMap.put(baseImage, decoratedMap);
-		}
-		//
-		Image result = decoratedMap.get(decorator);
-		if (result == null) {
-			final Rectangle bib = baseImage.getBounds();
-			final Rectangle dib = decorator.getBounds();
-			final Point baseImageSize = new Point(bib.width, bib.height);
-			CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() {
-				@Override
-				protected void drawCompositeImage(int width, int height) {
-					drawImage(baseImage.getImageData(), 0, 0);
-					if (corner == TOP_LEFT) {
-						drawImage(decorator.getImageData(), 0, 0);
-					} else if (corner == TOP_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, 0);
-					} else if (corner == BOTTOM_LEFT) {
-						drawImage(decorator.getImageData(), 0, bib.height - dib.height);
-					} else if (corner == BOTTOM_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height);
-					}
-				}
-
-				@Override
-				protected Point getSize() {
-					return baseImageSize;
-				}
-			};
-			//
-			result = compositImageDesc.createImage();
-			decoratedMap.put(decorator, result);
-		}
-		return result;
-	}
-
-	/**
-	 * Dispose all of the cached images.
-	 */
-	public static void disposeImages() {
-		SWTResourceManager.disposeImages();
-		// dispose ImageDescriptor images
-		{
-			for (Iterator<Image> I = m_descriptorImageMap.values().iterator(); I.hasNext();) {
-				I.next().dispose();
-			}
-			m_descriptorImageMap.clear();
-		}
-		// dispose decorated images
-		for (int i = 0; i < m_decoratedImageMap.length; i++) {
-			Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
-			if (cornerDecoratedImageMap != null) {
-				for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
-					for (Image image : decoratedMap.values()) {
-						image.dispose();
-					}
-					decoratedMap.clear();
-				}
-				cornerDecoratedImageMap.clear();
-			}
-		}
-		// dispose plugin images
-		{
-			for (Iterator<Image> I = m_URLImageMap.values().iterator(); I.hasNext();) {
-				I.next().dispose();
-			}
-			m_URLImageMap.clear();
-		}
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Plugin images support
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Maps URL to images.
-	 */
-	private static Map<String, Image> m_URLImageMap = new HashMap<String, Image>();
-
-	/**
-	 * Provider for plugin resources, used by WindowBuilder at design time.
-	 */
-	public interface PluginResourceProvider {
-		URL getEntry(String symbolicName, String path);
-	}
-
-	/**
-	 * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design time.
-	 */
-	private static PluginResourceProvider m_designTimePluginResourceProvider = null;
-
-	/**
-	 * Returns an {@link Image} based on a plugin and file path.
-	 *
-	 * @param plugin
-	 *            the plugin {@link Object} containing the image
-	 * @param name
-	 *            the path to the image within the plugin
-	 * @return the {@link Image} stored in the file at the specified path
-	 *
-	 * @deprecated Use {@link #getPluginImage(String, String)} instead.
-	 */
-	@Deprecated
-	public static Image getPluginImage(Object plugin, String name) {
-		try {
-			URL url = getPluginImageURL(plugin, name);
-			if (url != null) {
-				return getPluginImageFromUrl(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-	 *
-	 * @param symbolicName
-	 *            the symbolic name of the {@link Bundle}.
-	 * @param path
-	 *            the path of the resource entry.
-	 * @return the {@link Image} stored in the file at the specified path.
-	 */
-	public static Image getPluginImage(String symbolicName, String path) {
-		try {
-			URL url = getPluginImageURL(symbolicName, path);
-			if (url != null) {
-				return getPluginImageFromUrl(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an {@link Image} based on given {@link URL}.
-	 */
-	private static Image getPluginImageFromUrl(URL url) {
-		try {
-			try {
-				String key = url.toExternalForm();
-				Image image = m_URLImageMap.get(key);
-				if (image == null) {
-					InputStream stream = url.openStream();
-					try {
-						image = getImage(stream);
-						m_URLImageMap.put(key, image);
-					} finally {
-						stream.close();
-					}
-				}
-				return image;
-			} catch (Throwable e) {
-				// Ignore any exceptions
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an {@link ImageDescriptor} based on a plugin and file path.
-	 *
-	 * @param plugin
-	 *            the plugin {@link Object} containing the image.
-	 * @param name
-	 *            the path to th eimage within the plugin.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 *
-	 * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
-	 */
-	@Deprecated
-	public static ImageDescriptor getPluginImageDescriptor(Object plugin, String name) {
-		try {
-			try {
-				URL url = getPluginImageURL(plugin, name);
-				return ImageDescriptor.createFromURL(url);
-			} catch (Throwable e) {
-				// Ignore any exceptions
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-	 *
-	 * @param symbolicName
-	 *            the symbolic name of the {@link Bundle}.
-	 * @param path
-	 *            the path of the resource entry.
-	 * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-	 */
-	public static ImageDescriptor getPluginImageDescriptor(String symbolicName, String path) {
-		try {
-			URL url = getPluginImageURL(symbolicName, path);
-			if (url != null) {
-				return ImageDescriptor.createFromURL(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an {@link URL} based on a {@link Bundle} and resource entry path.
-	 */
-	private static URL getPluginImageURL(String symbolicName, String path) {
-		// try runtime plugins
-		{
-			Bundle bundle = Platform.getBundle(symbolicName);
-			if (bundle != null) {
-				return bundle.getEntry(path);
-			}
-		}
-		// try design time provider
-		if (m_designTimePluginResourceProvider != null) {
-			return m_designTimePluginResourceProvider.getEntry(symbolicName, path);
-		}
-		// no such resource
-		return null;
-	}
-
-	/**
-	 * Returns an {@link URL} based on a plugin and file path.
-	 *
-	 * @param plugin
-	 *            the plugin {@link Object} containing the file path.
-	 * @param name
-	 *            the file path.
-	 * @return the {@link URL} representing the file at the specified path.
-	 * @throws Exception
-	 */
-	private static URL getPluginImageURL(Object plugin, String name) throws Exception {
-		// try to work with 'plugin' as with OSGI BundleContext
-		try {
-			Class<?> BundleClass = Class.forName("org.osgi.framework.Bundle"); //$NON-NLS-1$
-			Class<?> BundleContextClass = Class.forName("org.osgi.framework.BundleContext"); //$NON-NLS-1$
-			if (BundleContextClass.isAssignableFrom(plugin.getClass())) {
-				Method getBundleMethod = BundleContextClass.getMethod("getBundle", new Class[0]); //$NON-NLS-1$
-				Object bundle = getBundleMethod.invoke(plugin, new Object[0]);
-				//
-				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[] { String.class });
-				Object path = pathConstructor.newInstance(new Object[] { name });
-				//
-				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
-				Class<?> PlatformClass = Class.forName("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
-				Method findMethod = PlatformClass.getMethod("find", new Class[] { BundleClass, IPathClass }); //$NON-NLS-1$
-				return (URL) findMethod.invoke(null, new Object[] { bundle, path });
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		// else work with 'plugin' as with usual Eclipse plugin
-		{
-			Class<?> PluginClass = Class.forName("org.eclipse.core.runtime.Plugin"); //$NON-NLS-1$
-			if (PluginClass.isAssignableFrom(plugin.getClass())) {
-				//
-				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[] { String.class });
-				Object path = pathConstructor.newInstance(new Object[] { name });
-				//
-				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
-				Method findMethod = PluginClass.getMethod("find", new Class[] { IPathClass }); //$NON-NLS-1$
-				return (URL) findMethod.invoke(plugin, new Object[] { path });
-			}
-		}
-		return null;
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// General
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
-	 * objects are no longer needed (e.g. on application shutdown).
-	 */
-	public static void dispose() {
-		disposeColors();
-		disposeFonts();
-		disposeImages();
-	}
-}
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java
deleted file mode 100644
index 94978b58131..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package com.swtdesigner;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Utility class for managing OS resources associated with SWT controls such as colors, fonts, images, etc.
- * <p>
- * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the operating system resources managed by cached objects when those objects and OS resources are no longer needed (e.g. on application shutdown)
- * <p>
- * This class may be freely distributed as part of any application or plugin.
- * <p>
- * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
- * All Rights Reserved
- *
- * @author scheglov_ke
- * @author Dan Rubel
- */
-public class SWTResourceManager {
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Color
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	private static Map<RGB, Color> m_colorMap = new HashMap<RGB, Color>();
-
-	/**
-	 * Returns the system {@link Color} matching the specific ID.
-	 *
-	 * @param systemColorID
-	 *            the ID value for the color
-	 * @return the system {@link Color} matching the specific ID
-	 */
-	public static Color getColor(int systemColorID) {
-		Display display = Display.getCurrent();
-		return display.getSystemColor(systemColorID);
-	}
-
-	/**
-	 * Returns a {@link Color} given its red, green and blue component values.
-	 *
-	 * @param r
-	 *            the red component of the color
-	 * @param g
-	 *            the green component of the color
-	 * @param b
-	 *            the blue component of the color
-	 * @return the {@link Color} matching the given red, green and blue component values
-	 */
-	public static Color getColor(int r, int g, int b) {
-		return getColor(new RGB(r, g, b));
-	}
-
-	/**
-	 * Returns a {@link Color} given its RGB value.
-	 *
-	 * @param rgb
-	 *            the {@link RGB} value of the color
-	 * @return the {@link Color} matching the RGB value
-	 */
-	public static Color getColor(RGB rgb) {
-		Color color = m_colorMap.get(rgb);
-		if (color == null) {
-			Display display = Display.getCurrent();
-			color = new Color(display, rgb);
-			m_colorMap.put(rgb, color);
-		}
-		return color;
-	}
-
-	/**
-	 * Dispose of all the cached {@link Color}'s.
-	 */
-	public static void disposeColors() {
-		for (Color color : m_colorMap.values()) {
-			color.dispose();
-		}
-		m_colorMap.clear();
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Image
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Maps image paths to images.
-	 */
-	private static Map<String, Image> m_imageMap = new HashMap<String, Image>();
-
-	/**
-	 * Returns an {@link Image} encoded by the specified {@link InputStream}.
-	 *
-	 * @param stream
-	 *            the {@link InputStream} encoding the image data
-	 * @return the {@link Image} encoded by the specified input stream
-	 */
-	protected static Image getImage(InputStream stream) throws IOException {
-		try {
-			Display display = Display.getCurrent();
-			ImageData data = new ImageData(stream);
-			if (data.transparentPixel > 0) {
-				return new Image(display, data, data.getTransparencyMask());
-			}
-			return new Image(display, data);
-		} finally {
-			stream.close();
-		}
-	}
-
-	/**
-	 * Returns an {@link Image} stored in the file at the specified path.
-	 *
-	 * @param path
-	 *            the path to the image file
-	 * @return the {@link Image} stored in the file at the specified path
-	 */
-	public static Image getImage(String path) {
-		Image image = m_imageMap.get(path);
-		if (image == null) {
-			try {
-				image = getImage(new FileInputStream(path));
-				m_imageMap.put(path, image);
-			} catch (Exception e) {
-				image = getMissingImage();
-				m_imageMap.put(path, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
-	 *
-	 * @param clazz
-	 *            the {@link Class} relative to which to find the image
-	 * @param path
-	 *            the path to the image file, if starts with <code>'/'</code>
-	 * @return the {@link Image} stored in the file at the specified path
-	 */
-	public static Image getImage(Class<?> clazz, String path) {
-		String key = clazz.getName() + '|' + path;
-		Image image = m_imageMap.get(key);
-		if (image == null) {
-			try {
-				image = getImage(clazz.getResourceAsStream(path));
-				m_imageMap.put(key, image);
-			} catch (Exception e) {
-				image = getMissingImage();
-				m_imageMap.put(key, image);
-			}
-		}
-		return image;
-	}
-
-	private static final int MISSING_IMAGE_SIZE = 10;
-
-	/**
-	 * @return the small {@link Image} that can be used as placeholder for missing image.
-	 */
-	private static Image getMissingImage() {
-		Image image = new Image(Display.getCurrent(), MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
-		//
-		GC gc = new GC(image);
-		gc.setBackground(getColor(SWT.COLOR_RED));
-		gc.fillRectangle(0, 0, MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
-		gc.dispose();
-		//
-		return image;
-	}
-
-	/**
-	 * Style constant for placing decorator image in top left corner of base image.
-	 */
-	public static final int TOP_LEFT = 1;
-	/**
-	 * Style constant for placing decorator image in top right corner of base image.
-	 */
-	public static final int TOP_RIGHT = 2;
-	/**
-	 * Style constant for placing decorator image in bottom left corner of base image.
-	 */
-	public static final int BOTTOM_LEFT = 3;
-	/**
-	 * Style constant for placing decorator image in bottom right corner of base image.
-	 */
-	public static final int BOTTOM_RIGHT = 4;
-	/**
-	 * Internal value.
-	 */
-	protected static final int LAST_CORNER_KEY = 5;
-	/**
-	 * Maps images to decorated images.
-	 */
-	@SuppressWarnings("unchecked")
-	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
-
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 *
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image
-	 * @return {@link Image} The resulting decorated image
-	 */
-	public static Image decorateImage(Image baseImage, Image decorator) {
-		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
-	}
-
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 *
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image
-	 * @param corner
-	 *            the corner to place decorator image
-	 * @return the resulting decorated {@link Image}
-	 */
-	public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
-		if (corner <= 0 || corner >= LAST_CORNER_KEY) {
-			throw new IllegalArgumentException("Wrong decorate corner");
-		}
-		Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
-		if (cornerDecoratedImageMap == null) {
-			cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
-			m_decoratedImageMap[corner] = cornerDecoratedImageMap;
-		}
-		Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
-		if (decoratedMap == null) {
-			decoratedMap = new HashMap<Image, Image>();
-			cornerDecoratedImageMap.put(baseImage, decoratedMap);
-		}
-		//
-		Image result = decoratedMap.get(decorator);
-		if (result == null) {
-			Rectangle bib = baseImage.getBounds();
-			Rectangle dib = decorator.getBounds();
-			//
-			result = new Image(Display.getCurrent(), bib.width, bib.height);
-			//
-			GC gc = new GC(result);
-			gc.drawImage(baseImage, 0, 0);
-			if (corner == TOP_LEFT) {
-				gc.drawImage(decorator, 0, 0);
-			} else if (corner == TOP_RIGHT) {
-				gc.drawImage(decorator, bib.width - dib.width, 0);
-			} else if (corner == BOTTOM_LEFT) {
-				gc.drawImage(decorator, 0, bib.height - dib.height);
-			} else if (corner == BOTTOM_RIGHT) {
-				gc.drawImage(decorator, bib.width - dib.width, bib.height - dib.height);
-			}
-			gc.dispose();
-			//
-			decoratedMap.put(decorator, result);
-		}
-		return result;
-	}
-
-	/**
-	 * Dispose all of the cached {@link Image}'s.
-	 */
-	public static void disposeImages() {
-		// dispose loaded images
-		{
-			for (Image image : m_imageMap.values()) {
-				image.dispose();
-			}
-			m_imageMap.clear();
-		}
-		// dispose decorated images
-		for (int i = 0; i < m_decoratedImageMap.length; i++) {
-			Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
-			if (cornerDecoratedImageMap != null) {
-				for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
-					for (Image image : decoratedMap.values()) {
-						image.dispose();
-					}
-					decoratedMap.clear();
-				}
-				cornerDecoratedImageMap.clear();
-			}
-		}
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Font
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Maps font names to fonts.
-	 */
-	private static Map<String, Font> m_fontMap = new HashMap<String, Font>();
-	/**
-	 * Maps fonts to their bold versions.
-	 */
-	private static Map<Font, Font> m_fontToBoldFontMap = new HashMap<Font, Font>();
-
-	/**
-	 * Returns a {@link Font} based on its name, height and style.
-	 *
-	 * @param name
-	 *            the name of the font
-	 * @param height
-	 *            the height of the font
-	 * @param style
-	 *            the style of the font
-	 * @return {@link Font} The font matching the name, height and style
-	 */
-	public static Font getFont(String name, int height, int style) {
-		return getFont(name, height, style, false, false);
-	}
-
-	/**
-	 * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
-	 * flags are also supported.
-	 *
-	 * @param name
-	 *            the name of the font
-	 * @param size
-	 *            the size of the font
-	 * @param style
-	 *            the style of the font
-	 * @param strikeout
-	 *            the strikeout flag (warning: Windows only)
-	 * @param underline
-	 *            the underline flag (warning: Windows only)
-	 * @return {@link Font} The font matching the name, height, style, strikeout and underline
-	 */
-	public static Font getFont(String name, int size, int style, boolean strikeout, boolean underline) {
-		String fontName = name + '|' + size + '|' + style + '|' + strikeout + '|' + underline;
-		Font font = m_fontMap.get(fontName);
-		if (font == null) {
-			FontData fontData = new FontData(name, size, style);
-			if (strikeout || underline) {
-				try {
-					Class<?> logFontClass = Class.forName("org.eclipse.swt.internal.win32.LOGFONT"); //$NON-NLS-1$
-					Object logFont = FontData.class.getField("data").get(fontData); //$NON-NLS-1$
-					if (logFont != null && logFontClass != null) {
-						if (strikeout) {
-							logFontClass.getField("lfStrikeOut").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
-						}
-						if (underline) {
-							logFontClass.getField("lfUnderline").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
-						}
-					}
-				} catch (Throwable e) {
-					System.err.println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			font = new Font(Display.getCurrent(), fontData);
-			m_fontMap.put(fontName, font);
-		}
-		return font;
-	}
-
-	/**
-	 * Returns a bold version of the given {@link Font}.
-	 *
-	 * @param baseFont
-	 *            the {@link Font} for which a bold version is desired
-	 * @return the bold version of the given {@link Font}
-	 */
-	public static Font getBoldFont(Font baseFont) {
-		Font font = m_fontToBoldFontMap.get(baseFont);
-		if (font == null) {
-			FontData fontDatas[] = baseFont.getFontData();
-			FontData data = fontDatas[0];
-			font = new Font(Display.getCurrent(), data.getName(), data.getHeight(), SWT.BOLD);
-			m_fontToBoldFontMap.put(baseFont, font);
-		}
-		return font;
-	}
-
-	/**
-	 * Dispose all of the cached {@link Font}'s.
-	 */
-	public static void disposeFonts() {
-		// clear fonts
-		for (Font font : m_fontMap.values()) {
-			font.dispose();
-		}
-		m_fontMap.clear();
-		// clear bold fonts
-		for (Font font : m_fontToBoldFontMap.values()) {
-			font.dispose();
-		}
-		m_fontToBoldFontMap.clear();
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// Cursor
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Maps IDs to cursors.
-	 */
-	private static Map<Integer, Cursor> m_idToCursorMap = new HashMap<Integer, Cursor>();
-
-	/**
-	 * Returns the system cursor matching the specific ID.
-	 *
-	 * @param id
-	 *            int The ID value for the cursor
-	 * @return Cursor The system cursor matching the specific ID
-	 */
-	public static Cursor getCursor(int id) {
-		Integer key = Integer.valueOf(id);
-		Cursor cursor = m_idToCursorMap.get(key);
-		if (cursor == null) {
-			cursor = new Cursor(Display.getDefault(), id);
-			m_idToCursorMap.put(key, cursor);
-		}
-		return cursor;
-	}
-
-	/**
-	 * Dispose all of the cached cursors.
-	 */
-	public static void disposeCursors() {
-		for (Cursor cursor : m_idToCursorMap.values()) {
-			cursor.dispose();
-		}
-		m_idToCursorMap.clear();
-	}
-
-	// //////////////////////////////////////////////////////////////////////////
-	//
-	// General
-	//
-	// //////////////////////////////////////////////////////////////////////////
-	/**
-	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
-	 * objects are no longer needed (e.g. on application shutdown).
-	 */
-	public static void dispose() {
-		disposeColors();
-		disposeImages();
-		disposeFonts();
-		disposeCursors();
-	}
-}
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java
deleted file mode 100644
index 0944cff753b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class FacadeDefinitionEditorActivator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.FacadeSpecificEditor"; //$NON-NLS-1$

-

-	// The shared instance

-	private static FacadeDefinitionEditorActivator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public FacadeDefinitionEditorActivator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static FacadeDefinitionEditorActivator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns an image descriptor for the image file at the given plug-in relative path

-	 *

-	 * @param path

-	 *            the path

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String path) {

-		return imageDescriptorFromPlugin(PLUGIN_ID, path);

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java
deleted file mode 100644
index a75a71a5c38..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java
+++ /dev/null
@@ -1,757 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TableViewerColumn;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.TreeViewerColumn;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.presentation.FacadeEditor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.EditionUtils;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.ExtensionKindColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.IsPossibleColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassAliasColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassIsAbstractColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassToKeepColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassUseRepresentedColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesAliasColumnEdintingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesMaxColumnEdintingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesMinColumnEdintingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesToKeepColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.StereotypeIncompatibilityColumnEditingSupport;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.CreatePreliminaryMetamodelListener;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.EcoreGenerator;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.ExtensionDefintionContentProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.ExtensionDefintionLabelProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.IncompatibilitiesContentProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.IncompatibilitiesLabelProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.MetamodelContentProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.MetamodelLabelProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.TypedElementContentProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.providers.TypedElementLabelProvider;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.UMLModelUtils;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.standard.ExtensionLabelProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.TabFolder;

-import org.eclipse.swt.widgets.TabItem;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.dialogs.FilteredTree;

-import org.eclipse.ui.dialogs.ListSelectionDialog;

-import org.eclipse.ui.dialogs.PatternFilter;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * The Class Facade Definition Editor. It is mostly UI.

- */

-public class FacadeSpecificEditor extends FacadeEditor {

-

-	/** The facade under edition */

-	protected Facade facade;

-

-	/** The model resource of the facade */

-	protected Resource facadeModelResource;

-

-	/** The initialize button. */

-	protected Button initializeButton;

-

-	/** The profiles that are invloved in the facade. */

-	protected List<Profile> profileModels = new ArrayList<Profile>();

-

-	/** The resource set used to open UML profiles */

-	protected ResourceSet profileResourceSet = new ResourceSetImpl();

-

-

-	/**

-	 * UI elements

-	 */

-	protected Tree metamodelTree;

-

-	protected Tree extensionDefinitionTable;

-

-	protected FilteredTree extensionDefintionFilteredTreeViewer;

-

-	protected static TreeViewer extensionDefintionTreeViewer;

-

-	protected FilteredTree metamodelFilteredTreeViewer;

-

-	protected static TreeViewer metamodelTreeViewer;

-

-	protected TreeViewer propertiesTreeViewer;

-

-	protected Tree propertiesTree;

-

-	protected TableViewer incompatibilitiesTableViewer;

-

-	protected Table incompatibilitiesTable;

-

-	protected TabFolder tabFolder;

-

-	protected Button createMetamodelButton;

-

-	protected Button createEcoreButton;

-

-	protected Button createGlueButton;

-

-	protected Text metamodelName;

-

-	protected Text nsPrefix;

-

-	protected Text nsURI;

-

-

-	/**

-	 * @see org.eclipse.papyrus.facade.presentation.FacadeEditor#createModel()

-	 *

-	 */

-	@Override

-	public void createModel() {

-

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		facadeModelResource = null;

-		try {

-			// Load the resource through the editing domain.

-			facadeModelResource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			facadeModelResource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(facadeModelResource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(facadeModelResource, analyzeResourceProblems(facadeModelResource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-

-		if (facadeModelResource.getContents().size() > 0) {

-			// Get the root

-			facade = (Facade) facadeModelResource.getContents().get(0);

-

-			if (!facade.getExtensionDefinitions().isEmpty()) {

-				// Shouldn't be required but just in case

-				ProfileUtils.clearSiblings();

-

-				for (ExtensionDefinition stereotypeDefinition : facade.getExtensionDefinitions()) {

-					ProfileUtils.initSiblings(stereotypeDefinition.getStereotype());

-				}

-			}

-		}

-	}

-

-	/**

-	 * Getter for the extensionDefintionTreeViewer widget

-	 *

-	 * @return the extensionDefintionTreeViewer widget

-	 */

-	public static TreeViewer getExtensionDefintionTreeViewer() {

-		return extensionDefintionTreeViewer;

-	}

-

-	/**

-	 * Getter for the metamodelTreeViewer widget

-	 *

-	 * @return the metamodelTreeViewer widget

-	 */

-	public static TreeViewer getMetamodelTreeViewer() {

-		return metamodelTreeViewer;

-	}

-

-	/**

-	 * Helper method to clear the facade.

-	 */

-	protected void clearModel() {

-		RemoveCommand commandMetaclasses = new RemoveCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_Virtualmetamodel(), facade.getVirtualmetamodel());

-		editingDomain.getCommandStack().execute(commandMetaclasses);

-

-		RemoveCommand commandStereotype = new RemoveCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_ExtensionDefinitions(), facade.getExtensionDefinitions());

-		editingDomain.getCommandStack().execute(commandStereotype);

-	}

-

-

-	protected class FacadeInitializer extends MouseAdapter {

-

-		/**

-		 * Open profiles to start the definition of the facade.

-		 */

-		protected void openProfile() {

-			List<IRegisteredProfile> regProfiles = RegisteredProfile.getRegisteredProfiles();

-			ListSelectionDialog dlg = new ListSelectionDialog(Display.getCurrent().getActiveShell(), regProfiles, CollectionContentProvider.instance, new ExtensionLabelProvider(), Messages.FacadeSpecificEditor_1);

-			dlg.setTitle(Messages.FacadeSpecificEditor_2);

-			dlg.open();

-			if (dlg.getResult() != null) {

-

-				for (Object selectedElement : dlg.getResult()) {

-					if (selectedElement instanceof RegisteredProfile) {

-						EObject model = UMLModelUtils.loadModel(((RegisteredProfile) selectedElement).uri, profileResourceSet);

-						if (model instanceof Profile) {

-							TreeIterator<EObject> it = model.eAllContents();

-							boolean failed = false;

-							while (it.hasNext() && !failed) {

-								EObject eObject = it.next();

-								if (eObject instanceof PrimitiveType) {

-									Stereotype stereotype = ((PrimitiveType) eObject).getAppliedStereotype("Ecore::EDataType"); //$NON-NLS-1$

-									if (stereotype != null) {

-										Object value = ((PrimitiveType) eObject).getValue(stereotype, "instanceClassName"); //$NON-NLS-1$

-										if (!(value instanceof String)) {

-											failed = true;

-											MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_5, Messages.FacadeSpecificEditor_6 + ((PrimitiveType) eObject).getName() + Messages.FacadeSpecificEditor_7);

-										}

-									}

-								}

-								if (eObject instanceof Extension) {

-									if (((Extension) eObject).isRequired()) {

-										failed = true;

-										MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_8, Messages.FacadeSpecificEditor_9);

-									}

-								}

-							}

-							if (!failed) {

-								profileModels.add((Profile) model);

-							}

-						} else {

-							MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_10, Messages.FacadeSpecificEditor_11);

-						}

-					}

-				}

-			}

-		}

-

-		/**

-		 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

-		 *

-		 * @param e

-		 */

-

-		@Override

-		public void mouseUp(MouseEvent e) {

-

-			profileModels.clear();

-

-			openProfile();

-

-			if (!profileModels.isEmpty()) {

-

-				clearModel();

-				ProfileUtils.clearSiblings();

-

-				VirtualMetamodel virtualMetamodel = VirtualmetamodelFactory.eINSTANCE.createVirtualMetamodel();

-				virtualMetamodel.setName(""); //$NON-NLS-1$

-				virtualMetamodel.setNsPrefix(""); //$NON-NLS-1$

-				virtualMetamodel.setNsURI(""); //$NON-NLS-1$

-

-				SetCommand command = new SetCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_Virtualmetamodel(), virtualMetamodel);

-				editingDomain.getCommandStack().execute(command);

-

-				createExtensionDefinitions();

-

-				extensionDefintionTreeViewer.refresh();

-

-				metamodelTreeViewer.refresh();

-			}

-		}

-	}

-

-	/**

-	 * Creates the extension definitions from the selected UML profiles

-	 */

-	protected void createExtensionDefinitions() {

-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-		try {

-			dialog.run(false, false, new IRunnableWithProgress() {

-

-				@Override

-				public void run(IProgressMonitor monitor) {

-					monitor.beginTask(Messages.FacadeSpecificEditor_15, IProgressMonitor.UNKNOWN);

-

-					// Find all extensions be it in the profile or in another profile

-					Set<Extension> extensions = new HashSet<Extension>();

-

-					for (Profile profile : profileModels) {

-

-						TreeIterator<EObject> iterator = profile.eAllContents();

-						while (iterator.hasNext()) {

-							EObject eObject = iterator.next();

-							if (eObject instanceof Stereotype) {

-

-								extensions.addAll(ProfileUtils.findExtensions((Stereotype) eObject));

-

-							}

-						}

-					}

-

-					for (Extension extension : extensions) {

-

-						List<Stereotype> stereotypes = ProfileUtils.findAllSubsInProfile(extension.getStereotype());

-

-						stereotypes.add(extension.getStereotype());

-

-						for (Stereotype stereotype : stereotypes) {

-							ExtensionDefinition extensionDefinition = ExtensiondefinitionFactory.eINSTANCE.createExtensionDefinition();

-							extensionDefinition.setExtension(extension);

-							extensionDefinition.setKind(ExtensionDefinitionKind.ASSOCIATION);

-							extensionDefinition.setStereotype(stereotype);

-

-							AddCommand command = new AddCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_ExtensionDefinitions(), extensionDefinition);

-							editingDomain.getCommandStack().execute(command);

-

-							ProfileUtils.initSiblings(stereotype);

-

-							List<EClass> baseMetaclasses = StereotypeUtils.getAllExtendableMetaclasses(extension, false);

-							for (EClass eClass : baseMetaclasses) {

-

-								BaseMetaclass baseMetaclass = ExtensiondefinitionFactory.eINSTANCE.createBaseMetaclass();

-								baseMetaclass.setBase(eClass);

-								baseMetaclass.setPossible(true);

-

-								AddCommand command2 = new AddCommand(editingDomain, extensionDefinition, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_BaseMetaclasses(), baseMetaclass);

-								editingDomain.getCommandStack().execute(command2);

-							}

-						}

-					}

-

-					EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

-

-					EditionUtils.initIsPossible(facade, editingDomain);

-

-					monitor.done();

-

-				}

-

-			});

-		} catch (InvocationTargetException e) {

-			e.printStackTrace();

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.facade.presentation.FacadeEditor#createPages()

-	 *

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			Composite composite = new Composite(getContainer(), SWT.NONE);

-			composite.setLayout(new GridLayout(1, true));

-

-			initializeButton = new Button(composite, SWT.PUSH);

-			initializeButton.setText(Messages.FacadeSpecificEditor_16);

-			initializeButton.addMouseListener(new FacadeInitializer());

-

-			tabFolder = new TabFolder(composite, SWT.BORDER);

-			GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

-			tabFolder.setLayoutData(layoutData);

-			tabFolder.setLayout(new GridLayout(1, true));

-

-			TabItem clarifyExtensionsTabItem = new TabItem(tabFolder, SWT.NONE);

-			clarifyExtensionsTabItem.setText(Messages.FacadeSpecificEditor_17);

-

-			createClarifyExtension(tabFolder, clarifyExtensionsTabItem);

-

-			TabItem designMetamodelTabItem = new TabItem(tabFolder, SWT.NONE);

-			designMetamodelTabItem.setText(Messages.FacadeSpecificEditor_18);

-

-			createDesignMetamodel(tabFolder, designMetamodelTabItem);

-

-			TabItem generateMetamodelTabItem = new TabItem(tabFolder, SWT.NONE);

-			generateMetamodelTabItem.setText(Messages.FacadeSpecificEditor_19);

-

-			createGenerateEcore(tabFolder, generateMetamodelTabItem);

-

-			tabFolder.addSelectionListener(new SelectionAdapter() {

-

-				@Override

-				public void widgetSelected(org.eclipse.swt.events.SelectionEvent event) {

-					if (tabFolder.getSelectionIndex() <= 1) {

-						extensionDefintionTreeViewer.refresh();

-						metamodelTreeViewer.refresh();

-					}

-				}

-			});

-

-			addPage(composite);

-			setActivePage(0);

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		getContainer().addControlListener(new ControlAdapter() {

-

-			boolean guard = false;

-

-			@Override

-			public void controlResized(ControlEvent event) {

-				if (!guard) {

-					guard = true;

-					hideTabs();

-					guard = false;

-				}

-			}

-		});

-

-		getSite().getShell().getDisplay().asyncExec(new Runnable() {

-

-			@Override

-			public void run() {

-				updateProblemIndication();

-			}

-		});

-	}

-

-	/**

-	 * Creates the tab corresponding to the generation of the actual ECore metamodel

-	 *

-	 * @param tabFolder

-	 *            the tab folder

-	 * @param generateMetamodelTabItem

-	 *            the generate metamodel tab item

-	 */

-	protected void createGenerateEcore(Composite tabFolder, TabItem generateMetamodelTabItem) {

-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false);

-		Composite composite = new Composite(tabFolder, SWT.NONE);

-		composite.setLayoutData(layoutData);

-		composite.setLayout(new GridLayout(1, true));

-

-		Label metamodelNameLabel = new Label(composite, SWT.NONE);

-		metamodelNameLabel.setText(Messages.FacadeSpecificEditor_21);

-		metamodelName = new Text(composite, SWT.BORDER);

-		metamodelName.setLayoutData(layoutData);

-		if (facade.getVirtualmetamodel() != null) {

-			if (facade.getVirtualmetamodel().getName() != null) {

-				metamodelName.setText(facade.getVirtualmetamodel().getName());

-			} else {

-				metamodelName.setText(""); //$NON-NLS-1$

-			}

-		}

-		metamodelName.addModifyListener(new ModifyListener() {

-

-			@Override

-			public void modifyText(ModifyEvent e) {

-				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_Name(), metamodelName.getText());

-				editingDomain.getCommandStack().execute(commandName);

-			}

-		});

-

-		Label nsPrefixLabel = new Label(composite, SWT.NONE);

-		nsPrefixLabel.setText(Messages.FacadeSpecificEditor_23);

-		nsPrefix = new Text(composite, SWT.BORDER);

-		nsPrefix.setLayoutData(layoutData);

-		if (facade.getVirtualmetamodel() != null) {

-			if (facade.getVirtualmetamodel().getNsPrefix() != null) {

-				nsPrefix.setText(facade.getVirtualmetamodel().getNsPrefix());

-			} else {

-				nsPrefix.setText(""); //$NON-NLS-1$

-			}

-		}

-		nsPrefix.addModifyListener(new ModifyListener() {

-

-			@Override

-			public void modifyText(ModifyEvent e) {

-				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_NsPrefix(), nsPrefix.getText());

-				editingDomain.getCommandStack().execute(commandName);

-

-			}

-		});

-

-		Label nsURILabel = new Label(composite, SWT.NONE);

-		nsURILabel.setText(Messages.FacadeSpecificEditor_25);

-		nsURI = new Text(composite, SWT.BORDER);

-		nsURI.setLayoutData(layoutData);

-		if (facade.getVirtualmetamodel() != null) {

-			if (facade.getVirtualmetamodel().getNsURI() != null) {

-				nsURI.setText(facade.getVirtualmetamodel().getNsURI());

-			} else {

-				nsURI.setText(""); //$NON-NLS-1$

-			}

-		}

-		nsURI.addModifyListener(new ModifyListener() {

-

-			@Override

-			public void modifyText(ModifyEvent e) {

-				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_NsURI(), nsURI.getText());

-				editingDomain.getCommandStack().execute(commandName);

-

-			}

-		});

-

-		createEcoreButton = new Button(composite, SWT.NONE);

-		createEcoreButton.setText(Messages.FacadeSpecificEditor_27);

-		createEcoreButton.addMouseListener(new EcoreGenerator(facade, editingDomain));

-

-		generateMetamodelTabItem.setControl(composite);

-	}

-

-	/**

-	 * Creates the tab used to define the wanted facade metamodel.

-	 *

-	 * @param tabFolder

-	 *            the tab folder

-	 * @param designMetamodelTabItem

-	 *            the design metamodel tab item

-	 */

-	protected void createDesignMetamodel(Composite tabFolder, TabItem designMetamodelTabItem) {

-

-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

-		Composite composite = new Composite(tabFolder, SWT.NONE);

-		composite.setLayoutData(layoutData);

-		composite.setLayout(new GridLayout(1, true));

-

-		createMetamodelButton = new Button(composite, SWT.NONE);

-		createMetamodelButton.setText(Messages.FacadeSpecificEditor_28);

-		createMetamodelButton.addMouseListener(new CreatePreliminaryMetamodelListener(facade, editingDomain));

-

-		SashForm sashFormMetamodel = new SashForm(composite, SWT.VERTICAL);

-		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

-		sashFormMetamodel.setLayoutData(layoutData);

-		sashFormMetamodel.setLayout(new GridLayout(1, true));

-

-		metamodelFilteredTreeViewer = new FilteredTree(sashFormMetamodel, SWT.BORDER | SWT.FULL_SELECTION, new PatternFilter(), true);

-		metamodelTreeViewer = metamodelFilteredTreeViewer.getViewer();

-		metamodelTreeViewer.getControl().setLayoutData(layoutData);

-		metamodelTree = metamodelTreeViewer.getTree();

-		metamodelTree.setHeaderVisible(true);

-

-		TreeViewerColumn metaclassTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

-		TreeColumn metaclassTreeColumn = metaclassTreeViewerColumn.getColumn();

-		metaclassTreeColumn.setWidth(300);

-		metaclassTreeColumn.setText(Messages.FacadeSpecificEditor_29);

-

-		TreeViewerColumn metaclassToKeepTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

-		TreeColumn metaclassToKeepTreeColumn = metaclassToKeepTreeViewerColumn.getColumn();

-		metaclassToKeepTreeColumn.setWidth(60);

-		metaclassToKeepTreeColumn.setText(Messages.FacadeSpecificEditor_30);

-		metaclassToKeepTreeViewerColumn.setEditingSupport(new MetaclassToKeepColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree, facade));

-

-		TreeViewerColumn metaclassAliasTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

-		TreeColumn metaclassAliasTreeColumn = metaclassAliasTreeViewerColumn.getColumn();

-		metaclassAliasTreeColumn.setWidth(300);

-		metaclassAliasTreeColumn.setText(Messages.FacadeSpecificEditor_31);

-		metaclassAliasTreeViewerColumn.setEditingSupport(new MetaclassAliasColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

-

-		TreeViewerColumn metaclassIsAbstractTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

-		TreeColumn metaclassIsAbstractTreeColumn = metaclassIsAbstractTreeViewerColumn.getColumn();

-		metaclassIsAbstractTreeColumn.setWidth(100);

-		metaclassIsAbstractTreeColumn.setText(Messages.FacadeSpecificEditor_32);

-		metaclassIsAbstractTreeViewerColumn.setEditingSupport(new MetaclassIsAbstractColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

-

-		TreeViewerColumn metaclassUseRepresentedTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

-		TreeColumn metaclassUseRepresentedTreeColumn = metaclassUseRepresentedTreeViewerColumn.getColumn();

-		metaclassUseRepresentedTreeColumn.setWidth(100);

-		metaclassUseRepresentedTreeColumn.setText(Messages.FacadeSpecificEditor_0);

-		metaclassUseRepresentedTreeViewerColumn.setEditingSupport(new MetaclassUseRepresentedColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

-

-		metamodelTreeViewer.setContentProvider(new MetamodelContentProvider());

-		metamodelTreeViewer.setLabelProvider(new MetamodelLabelProvider());

-		metamodelTreeViewer.setInput(facade);

-

-		metamodelTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			@Override

-			public void selectionChanged(SelectionChangedEvent event) {

-				if (event.getSelection() instanceof IStructuredSelection) {

-					Object first = ((IStructuredSelection) event.getSelection()).getFirstElement();

-					propertiesTreeViewer.setInput(first);

-					propertiesTreeViewer.refresh();

-				}

-

-			}

-		});

-

-		propertiesTreeViewer = new TreeViewer(sashFormMetamodel, SWT.BORDER | SWT.FULL_SELECTION);

-		propertiesTreeViewer.getControl().setLayoutData(layoutData);

-		propertiesTree = propertiesTreeViewer.getTree();

-		propertiesTree.setHeaderVisible(true);

-

-		TreeViewerColumn propertiesTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

-		TreeColumn propertiesTableColumn = propertiesTableViewerColumn.getColumn();

-		propertiesTableColumn.setWidth(200);

-		propertiesTableColumn.setText(Messages.FacadeSpecificEditor_33);

-

-		TreeViewerColumn propertiesToKeepTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

-		TreeColumn propertiesToKeepTableColumn = propertiesToKeepTableViewerColumn.getColumn();

-		propertiesToKeepTableColumn.setWidth(60);

-		propertiesToKeepTableColumn.setText(Messages.FacadeSpecificEditor_34);

-		propertiesToKeepTableViewerColumn.setEditingSupport(new PropertiesToKeepColumnEditingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

-

-		TreeViewerColumn propertiesAliasTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

-		TreeColumn propertiesAliasTreeColumn = propertiesAliasTableViewerColumn.getColumn();

-		propertiesAliasTreeColumn.setWidth(200);

-		propertiesAliasTreeColumn.setText(Messages.FacadeSpecificEditor_35);

-		propertiesAliasTableViewerColumn.setEditingSupport(new PropertiesAliasColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

-

-		TreeViewerColumn propertiesMinTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

-		TreeColumn propertiesMinTreeColumn = propertiesMinTableViewerColumn.getColumn();

-		propertiesMinTreeColumn.setWidth(50);

-		propertiesMinTreeColumn.setText(Messages.FacadeSpecificEditor_36);

-		propertiesMinTableViewerColumn.setEditingSupport(new PropertiesMinColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

-

-		TreeViewerColumn propertiesMaxTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

-		TreeColumn propertiesMaxTreeColumn = propertiesMaxTableViewerColumn.getColumn();

-		propertiesMaxTreeColumn.setWidth(50);

-		propertiesMaxTreeColumn.setText(Messages.FacadeSpecificEditor_37);

-		propertiesMaxTableViewerColumn.setEditingSupport(new PropertiesMaxColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

-

-		propertiesTreeViewer.setContentProvider(new TypedElementContentProvider());

-		propertiesTreeViewer.setLabelProvider(new TypedElementLabelProvider());

-

-		designMetamodelTabItem.setControl(composite);

-

-	}

-

-	/**

-	 * Creates the tab used to clarify extensions identified in the UML profiles

-	 *

-	 * @param tabFolder

-	 *            the tab folder

-	 * @param clarifyExtensionsTabItem

-	 *            the clarify extensions tab item

-	 */

-	protected void createClarifyExtension(Composite tabFolder, TabItem clarifyExtensionsTabItem) {

-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

-

-		final SashForm sashForm = new SashForm(tabFolder, SWT.HORIZONTAL);

-		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

-		sashForm.setLayoutData(layoutData);

-		sashForm.setLayout(new GridLayout(1, true));

-

-		extensionDefintionFilteredTreeViewer = new FilteredTree(sashForm, SWT.BORDER | SWT.FULL_SELECTION, new PatternFilter(), true);

-		extensionDefintionTreeViewer = extensionDefintionFilteredTreeViewer.getViewer();

-		extensionDefintionTreeViewer.getControl().setLayoutData(layoutData);

-		extensionDefinitionTable = extensionDefintionTreeViewer.getTree();

-		extensionDefinitionTable.setHeaderVisible(true);

-

-		TreeViewerColumn extensionDefinitionTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

-		TreeColumn extensionDefinitionTableColumn = extensionDefinitionTableViewerColumn.getColumn();

-		extensionDefinitionTableColumn.setWidth(300);

-		extensionDefinitionTableColumn.setText(Messages.FacadeSpecificEditor_38);

-

-		TreeViewerColumn extensionKindTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

-		TreeColumn extensionKindTableColumn = extensionKindTableViewerColumn.getColumn();

-		extensionKindTableColumn.setWidth(150);

-		extensionKindTableColumn.setText(Messages.FacadeSpecificEditor_39);

-		extensionKindTableViewerColumn.setEditingSupport(new ExtensionKindColumnEditingSupport(extensionDefintionTreeViewer, editingDomain, extensionDefinitionTable));

-

-		TreeViewerColumn isPossibleTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

-		TreeColumn isPossibleTableColumn = isPossibleTableViewerColumn.getColumn();

-		isPossibleTableColumn.setWidth(200);

-		isPossibleTableColumn.setText(Messages.FacadeSpecificEditor_40);

-		isPossibleTableViewerColumn.setEditingSupport(new IsPossibleColumnEditingSupport(extensionDefintionTreeViewer, editingDomain, extensionDefinitionTable));

-

-		extensionDefintionTreeViewer.setContentProvider(new ExtensionDefintionContentProvider());

-		extensionDefintionTreeViewer.setLabelProvider(new ExtensionDefintionLabelProvider());

-		extensionDefintionTreeViewer.setInput(facade);

-

-		extensionDefintionTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			@Override

-			public void selectionChanged(SelectionChangedEvent event) {

-				if (event.getSelection() instanceof IStructuredSelection) {

-					Object first = ((IStructuredSelection) event.getSelection()).getFirstElement();

-					incompatibilitiesTableViewer.setInput(first);

-					incompatibilitiesTableViewer.refresh();

-				}

-

-			}

-		});

-

-		incompatibilitiesTableViewer = new TableViewer(sashForm, SWT.BORDER | SWT.FULL_SELECTION);

-		incompatibilitiesTableViewer.getControl().setLayoutData(layoutData);

-		incompatibilitiesTable = incompatibilitiesTableViewer.getTable();

-		incompatibilitiesTable.setHeaderVisible(true);

-

-		TableViewerColumn stereoTableViewerColumn = new TableViewerColumn(incompatibilitiesTableViewer, SWT.NONE);

-		TableColumn stereoTableColumn = stereoTableViewerColumn.getColumn();

-		stereoTableColumn.setWidth(300);

-		stereoTableColumn.setText(Messages.FacadeSpecificEditor_41);

-

-		TableViewerColumn stereoIncompatibilityTableViewerColumn = new TableViewerColumn(incompatibilitiesTableViewer, SWT.NONE);

-		TableColumn stereoIncompatibilityTableColumn = stereoIncompatibilityTableViewerColumn.getColumn();

-		stereoIncompatibilityTableColumn.setWidth(150);

-		stereoIncompatibilityTableColumn.setText(Messages.FacadeSpecificEditor_42);

-		stereoIncompatibilityTableViewerColumn.setEditingSupport(new StereotypeIncompatibilityColumnEditingSupport(incompatibilitiesTableViewer, editingDomain, incompatibilitiesTable));

-

-		incompatibilitiesTableViewer.setContentProvider(new IncompatibilitiesContentProvider());

-		incompatibilitiesTableViewer.setLabelProvider(new IncompatibilitiesLabelProvider());

-

-		clarifyExtensionsTabItem.setControl(sashForm);

-

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java
deleted file mode 100644
index ff982c2ef9c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facadeSpecificEditor.messages"; //$NON-NLS-1$

-

-	public static String EcoreGenerator_10;

-

-	public static String EcoreGenerator_11;

-

-	public static String EcoreGenerator_12;

-

-	public static String EcoreGenerator_13;

-

-	public static String EcoreGenerator_14;

-

-	public static String EcoreGenerator_15;

-

-	public static String EcoreGenerator_16;

-

-	public static String EcoreGenerator_17;

-

-	public static String EcoreGenerator_18;

-

-	public static String EcoreGenerator_19;

-

-	public static String EcoreGenerator_20;

-

-	public static String EcoreGenerator_21;

-

-	public static String EcoreGenerator_22;

-

-	public static String EcoreGenerator_23;

-

-	public static String EcoreGenerator_24;

-

-	public static String EcoreGenerator_25;

-

-	public static String EcoreGenerator_26;

-

-	public static String EcoreGenerator_27;

-

-	public static String EcoreGenerator_3;

-

-	public static String EcoreGenerator_30;

-

-	public static String EcoreGenerator_31;

-

-	public static String EcoreGenerator_35;

-

-	public static String EcoreGenerator_36;

-

-	public static String EcoreGenerator_37;

-

-	public static String EcoreGenerator_4;

-

-	public static String EcoreGenerator_40;

-

-	public static String EcoreGenerator_41;

-

-	public static String EcoreGenerator_42;

-

-	public static String EcoreGenerator_43;

-

-	public static String EcoreGenerator_44;

-

-	public static String EcoreGenerator_45;

-

-	public static String EcoreGenerator_5;

-

-	public static String EcoreGenerator_6;

-

-	public static String EcoreGenerator_9;

-

-	public static String ExtensionDefintionLabelProvider_13;

-

-	public static String ExtensionKindColumnEditingSupport_0;

-

-	public static String ExtensionKindColumnEditingSupport_1;

-

-	public static String ExtensionKindColumnEditingSupport_2;

-

-	public static String ExtensionKindColumnEditingSupport_3;

-

-	public static String ExtensionKindColumnEditingSupport_4;

-

-	public static String ExtensionKindColumnEditingSupport_5;

-

-	public static String ExtensionKindColumnEditingSupport_6;

-

-	public static String ExtensionKindColumnEditingSupport_7;

-

-	public static String ExtensionKindColumnEditingSupport_8;

-

-	public static String FacadeSpecificEditor_0;

-

-	public static String FacadeSpecificEditor_1;

-

-	public static String FacadeSpecificEditor_10;

-

-	public static String FacadeSpecificEditor_11;

-

-	public static String FacadeSpecificEditor_15;

-

-	public static String FacadeSpecificEditor_16;

-

-	public static String FacadeSpecificEditor_17;

-

-	public static String FacadeSpecificEditor_18;

-

-	public static String FacadeSpecificEditor_19;

-

-	public static String FacadeSpecificEditor_2;

-

-	public static String FacadeSpecificEditor_21;

-

-	public static String FacadeSpecificEditor_23;

-

-	public static String FacadeSpecificEditor_25;

-

-	public static String FacadeSpecificEditor_27;

-

-	public static String FacadeSpecificEditor_28;

-

-	public static String FacadeSpecificEditor_29;

-

-	public static String FacadeSpecificEditor_30;

-

-	public static String FacadeSpecificEditor_31;

-

-	public static String FacadeSpecificEditor_32;

-

-	public static String FacadeSpecificEditor_33;

-

-	public static String FacadeSpecificEditor_34;

-

-	public static String FacadeSpecificEditor_35;

-

-	public static String FacadeSpecificEditor_36;

-

-	public static String FacadeSpecificEditor_37;

-

-	public static String FacadeSpecificEditor_38;

-

-	public static String FacadeSpecificEditor_39;

-

-	public static String FacadeSpecificEditor_40;

-

-	public static String FacadeSpecificEditor_41;

-

-	public static String FacadeSpecificEditor_42;

-

-	public static String FacadeSpecificEditor_5;

-

-	public static String FacadeSpecificEditor_6;

-

-	public static String FacadeSpecificEditor_7;

-

-	public static String FacadeSpecificEditor_8;

-

-	public static String FacadeSpecificEditor_9;

-

-	public static String IsPossibleColumnEditingSupport_0;

-

-	public static String IsPossibleColumnEditingSupport_1;

-

-	public static String IsPossibleColumnEditingSupport_2;

-

-	public static String MetamodelLabelProvider_8;

-

-	public static String MetamodelUtils_0;

-

-	public static String MetamodelUtils_1;

-

-	public static String MetamodelUtils_10;

-

-	public static String MetamodelUtils_11;

-

-	public static String MetamodelUtils_12;

-

-	public static String MetamodelUtils_13;

-

-	public static String MetamodelUtils_2;

-

-	public static String MetamodelUtils_3;

-

-	public static String MetamodelUtils_4;

-

-	public static String MetamodelUtils_5;

-

-	public static String MetamodelUtils_6;

-

-	public static String MetamodelUtils_7;

-

-	public static String MetamodelUtils_8;

-

-	public static String MetamodelUtils_9;

-

-	public static String PropertiesMaxColumnEdintingSupport_0;

-

-	public static String PropertiesMaxColumnEdintingSupport_1;

-

-	public static String PropertiesMaxColumnEdintingSupport_2;

-

-	public static String PropertiesMaxColumnEdintingSupport_3;

-

-	public static String PropertiesMaxColumnEdintingSupport_4;

-

-	public static String PropertiesMaxColumnEdintingSupport_5;

-

-	public static String PropertiesMinColumnEdintingSupport_0;

-

-	public static String PropertiesMinColumnEdintingSupport_1;

-

-	public static String PropertiesMinColumnEdintingSupport_2;

-

-	public static String PropertiesMinColumnEdintingSupport_3;

-

-	public static String PropertiesMinColumnEdintingSupport_4;

-

-	public static String PropertiesMinColumnEdintingSupport_5;

-

-	public static String PropertiesToKeepColumnEditingSupport_0;

-

-	public static String PropertiesToKeepColumnEditingSupport_1;

-

-	public static String PropertiesToKeepColumnEditingSupport_2;

-

-	public static String PropertiesToKeepColumnEditingSupport_3;

-

-	public static String StereotypeIncompatibilityColumnEditingSupport_0;

-

-	public static String StereotypeIncompatibilityColumnEditingSupport_1;

-

-	public static String StereotypeIncompatibilityColumnEditingSupport_2;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java
deleted file mode 100644
index 133b2033ad7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-

-public class EditionUtils {

-

-	/**

-	 * Check is a combination of stereotypes appears in a list (independently from the order of the combination)

-	 *

-	 * @param list

-	 *            the list to search in

-	 * @param combinaison

-	 *            the combination to find

-	 * @return

-	 */

-	public static boolean containsCombination(List<Combination> list, Combination combinaison) {

-		for (Combination item : list) {

-			if (item.getMembers().size() == combinaison.getMembers().size()) {

-				if (item.getMembers().containsAll(combinaison.getMembers())) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-

-	}

-

-	/**

-	 * Find a combination of stereotypes appears in a list of combination (independently from the order of the combination)

-	 *

-	 * @param list

-	 *            the list to search in

-	 * @param combinaison

-	 *            the combination to find

-	 * @return

-	 */

-	public static Combination getCombinationThatMatch(List<Combination> list, Combination combinaison) {

-		for (Combination item : list) {

-			if (item.getMembers().size() == combinaison.getMembers().size()) {

-				if (item.getMembers().containsAll(combinaison.getMembers())) {

-					return item;

-				}

-			}

-		}

-

-		return null;

-

-	}

-

-	/**

-	 * Generate the stereotype combinations for the facade

-	 *

-	 * @param facade

-	 *            the facade to generate the combinations for

-	 * @param editingDomain

-	 */

-	public static void initAllStereotypeCombinations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			for (BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

-

-				List<Combination> possibleCombinations = ProfileUtils.getPossibleCombinations(baseMeta);

-

-				List<Combination> toAdd = new ArrayList<Combination>();

-

-				for (Combination combinaison : possibleCombinations) {

-

-					if (!containsCombination(baseMeta.getIncompatibleStereotypes(), combinaison)) {

-						if (!containsCombination(baseMeta.getCompatibleStereotypes(), combinaison)) {

-							toAdd.add(combinaison);

-						}

-					}

-				}

-

-				for (Combination combination : toAdd) {

-

-					AddCommand addIncompatibilitiesCommand = new AddCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combination);

-					editingDomain.getCommandStack().execute(addIncompatibilitiesCommand);

-				}

-			}

-		}

-	}

-

-	/**

-	 * Remove the stereotype combinations from the facade

-	 *

-	 * @param facade

-	 * @param editingDomain

-	 */

-	public static void clearAllStereotypeCombinations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			for (BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

-

-				List<Combination> possibleCombinations = ProfileUtils.getPossibleCombinations(baseMeta);

-

-				List<Combination> incompatibilitiesToRemove = new ArrayList<Combination>();

-

-				for (Combination incompatibleBase : baseMeta.getIncompatibleStereotypes()) {

-					if (!containsCombination(possibleCombinations, incompatibleBase)) {

-						incompatibilitiesToRemove.add(incompatibleBase);

-					}

-

-				}

-				RemoveCommand removeIncompatibilityCommand = new RemoveCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), incompatibilitiesToRemove);

-				editingDomain.getCommandStack().execute(removeIncompatibilityCommand);

-

-				List<Combination> compatibilitiesToRemove = new ArrayList<Combination>();

-

-				for (Combination compatibleBase : baseMeta.getCompatibleStereotypes()) {

-					if (!containsCombination(possibleCombinations, compatibleBase)) {

-						compatibilitiesToRemove.add(compatibleBase);

-					}

-				}

-				RemoveCommand removeCompatibilityCommand = new RemoveCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), compatibilitiesToRemove);

-				editingDomain.getCommandStack().execute(removeCompatibilityCommand);

-

-			}

-		}

-	}

-

-	/**

-	 * Check whether the baseMetaclass has a combination that is required

-	 *

-	 * @param baseMeta

-	 * @return

-	 */

-	public static boolean hasARequiredCombination(BaseMetaclass baseMeta) {

-

-		List<Combination> combinaisonsToCheck = new ArrayList<Combination>();

-

-		combinaisonsToCheck.addAll(baseMeta.getCompatibleStereotypes());

-		combinaisonsToCheck.addAll(baseMeta.getIncompatibleStereotypes());

-

-		for (Combination combination : combinaisonsToCheck) {

-			for (BaseMetaclass metaclass : combination.getMembers()) {

-				if (metaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-					if (metaclass.getExtensionDefinition().getExtension().isRequired()) {

-						return true;

-					}

-				}

-			}

-		}

-		return false;

-

-	}

-

-	/**

-	 * Initialize the isPossible of all the extension definitions of a Facade

-	 *

-	 * @param facade

-	 * @param editingDomain

-	 */

-	public static void initIsPossible(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			for (BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

-				// If it has a combination that contains a required

-				if (hasARequiredCombination(baseMeta)) {

-					baseMeta.setPossible(false);

-				} else {

-					baseMeta.setPossible(true);

-				}

-			}

-		}

-

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java
deleted file mode 100644
index 0be90cc164e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashSet;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.ComboBoxCellEditor;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-public class ExtensionKindColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public ExtensionKindColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.ASSOCIATION

-	 *

-	 * @param element

-	 */

-	protected void transformIntoAssociation(ExtensionDefinition element) {

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.ASSOCIATION);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.GENERALIZATION

-	 *

-	 * @param element

-	 */

-	protected void transformIntoGeneralization(ExtensionDefinition element) {

-

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.GENERALIZATION);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.MULTI_GENERALIZATION

-	 *

-	 * @param element

-	 */

-	protected void transformIntoMultiGeneralization(ExtensionDefinition element) {

-

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.MULTI_GENERALIZATION);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.FUSION

-	 *

-	 * @param element

-	 */

-	protected void transformIntoFusion(ExtensionDefinition element) {

-

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.FUSION);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Check if the stereotype involved in the extensionDefinition is also used to type the property of a stereotype elsewhere

-	 *

-	 * @param extensionDefinition

-	 * @return

-	 */

-	protected boolean stereotypeUsedElsewhere(ExtensionDefinition extensionDefinition) {

-		EList<ExtensionDefinition> allExtensionDefintion = extensionDefinition.getFacade().getExtensionDefinitions();

-

-		for (ExtensionDefinition otherExtensionDefinition : allExtensionDefintion) {

-			if (otherExtensionDefinition != extensionDefinition) {

-				for (Property property : otherExtensionDefinition.getStereotype().getAttributes()) {

-					if (property.getType() == extensionDefinition.getStereotype()) {

-						return true;

-					}

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * Check if the stereotype involved in the extensionDefinition is also involved in another extensionDefinition

-	 *

-	 * @param extensionDefinition

-	 * @return

-	 */

-	protected boolean hasOtherExtension(ExtensionDefinition extensionDefinition) {

-		EList<ExtensionDefinition> allExtensionDefintion = extensionDefinition.getFacade().getExtensionDefinitions();

-

-		for (ExtensionDefinition otherExtensionDefinition : allExtensionDefintion) {

-			if (otherExtensionDefinition != extensionDefinition) {

-				if (extensionDefinition.getStereotype() == otherExtensionDefinition.getStereotype()) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(final Object element, final Object value) {

-		final ExtensionDefinitionKind newValue = ExtensionDefinitionKind.get((Integer) value);

-

-		if (element instanceof ExtensionDefinition) {

-

-			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-			try {

-				dialog.run(false, false, new IRunnableWithProgress() {

-

-					@Override

-					public void run(IProgressMonitor monitor) {

-						monitor.beginTask(Messages.ExtensionKindColumnEditingSupport_0, IProgressMonitor.UNKNOWN);

-

-						Facade facade = ((ExtensionDefinition) element).getFacade();

-

-						if (newValue == ExtensionDefinitionKind.ASSOCIATION) {

-

-							transformIntoAssociation((ExtensionDefinition) element);

-

-							// All children and generals must be set to Association as well

-							HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition) element).getStereotype());

-

-							for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-

-								if (extensionDefinition.getExtension() == ((ExtensionDefinition) element).getExtension()) {

-									if (siblings.contains(extensionDefinition.getStereotype())) {

-

-										transformIntoAssociation(extensionDefinition);

-									}

-								}

-							}

-

-						} else if (newValue == ExtensionDefinitionKind.GENERALIZATION) {

-

-							if (((ExtensionDefinition) element).getExtension().getMetaclass().isAbstract()) {

-

-								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_1, Messages.ExtensionKindColumnEditingSupport_2);

-

-							} else {

-								if (((ExtensionDefinition) element).getExtension().isRequired()) {

-									MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_3, Messages.ExtensionKindColumnEditingSupport_4);

-								} else {

-

-									transformIntoGeneralization((ExtensionDefinition) element);

-									// All children and generals must be set to generalization as well

-									HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition) element).getStereotype());

-

-									for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-										if (extensionDefinition.getExtension() == ((ExtensionDefinition) element).getExtension()) {

-											if (siblings.contains(extensionDefinition.getStereotype())) {

-												transformIntoGeneralization(extensionDefinition);

-											}

-										}

-									}

-								}

-							}

-

-						} else if (newValue == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-

-							if (hasOtherExtension((ExtensionDefinition) element) && stereotypeUsedElsewhere((ExtensionDefinition) element)) {

-								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_5, Messages.ExtensionKindColumnEditingSupport_6);

-							} else {

-								transformIntoMultiGeneralization((ExtensionDefinition) element);

-								// All children and generals must be set to generalization as well

-								HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition) element).getStereotype());

-

-								for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-									if (extensionDefinition.getExtension() == ((ExtensionDefinition) element).getExtension()) {

-										if (siblings.contains(extensionDefinition.getStereotype())) {

-											transformIntoMultiGeneralization(extensionDefinition);

-										}

-									}

-								}

-							}

-

-						} else if (newValue == ExtensionDefinitionKind.FUSION) {

-							if (hasOtherExtension((ExtensionDefinition) element) && stereotypeUsedElsewhere((ExtensionDefinition) element)) {

-								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_7, Messages.ExtensionKindColumnEditingSupport_8);

-							} else {

-								transformIntoFusion((ExtensionDefinition) element);

-

-								// All children and generals must be set to generalization as well

-								HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition) element).getStereotype());

-

-								for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-									if (extensionDefinition.getExtension() == ((ExtensionDefinition) element).getExtension()) {

-										if (siblings.contains(extensionDefinition.getStereotype())) {

-											transformIntoFusion(extensionDefinition);

-										}

-									}

-								}

-							}

-						}

-

-						// Clear incompatibilities that don't exist anymore

-						EditionUtils.clearAllStereotypeCombinations(facade, editingDomain);

-						// Init new incompatibilities

-						EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

-						// Update isPossible

-						EditionUtils.initIsPossible(facade, editingDomain);

-

-						monitor.done();

-

-					}

-

-				});

-			} catch (InvocationTargetException e) {

-				e.printStackTrace();

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-

-			getViewer().refresh();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof ExtensionDefinition) {

-			int value = ((ExtensionDefinition) element).getKind().getValue();

-			return value;

-

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-

-		if (element instanceof ExtensionDefinition) {

-

-			String[] itemsArray = { ExtensionDefinitionKind.ASSOCIATION.getName(), ExtensionDefinitionKind.GENERALIZATION.getName(), ExtensionDefinitionKind.MULTI_GENERALIZATION.getName() };

-

-			ComboBoxCellEditor combo = new ComboBoxCellEditor(parent, itemsArray, SWT.READ_ONLY);

-

-			return combo;

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java
deleted file mode 100644
index 604a3501984..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashSet;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Stereotype;

-

-public class IsPossibleColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public IsPossibleColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 * Change IsPossible in the model to impossible

-	 *

-	 * @param element

-	 */

-	protected void transformPossibleIntoImpossible(BaseMetaclass element) {

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_Possible(), false);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Change IsPossible in the model to possible

-	 *

-	 * @param element

-	 */

-	protected void transformImpossibleIntoPossible(BaseMetaclass element) {

-

-		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_Possible(), true);

-		editingDomain.getCommandStack().execute(command);

-

-	}

-

-	/**

-	 * Change IsPossible in the model to impossible and propagate to children and generals

-	 *

-	 * @param element

-	 */

-	protected void transformAllPossibleIntoImpossible(BaseMetaclass element) {

-		Facade facade = element.getExtensionDefinition().getFacade();

-		transformPossibleIntoImpossible(element);

-

-		// All children and generals must be set to Impossible as well

-		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(element.getExtensionDefinition().getStereotype());

-

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition.getExtension() == element.getExtensionDefinition().getExtension()) {

-				if (siblings.contains(extensionDefinition.getStereotype())) {

-					for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-						if (baseMetaclass.getBase() == element.getBase()) {

-							transformPossibleIntoImpossible(baseMetaclass);

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Change IsPossible in the model to possible and propagate to children and generals

-	 *

-	 * @param element

-	 */

-	protected void transformAllImpossibleIntoPossible(BaseMetaclass element) {

-		Facade facade = element.getExtensionDefinition().getFacade();

-		transformImpossibleIntoPossible(element);

-

-		// All children and generals must be set to Possible as well

-		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(element.getExtensionDefinition().getStereotype());

-

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition.getExtension() == element.getExtensionDefinition().getExtension()) {

-				if (siblings.contains(extensionDefinition.getStereotype())) {

-					for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-						if (baseMetaclass.getBase() == element.getBase()) {

-							transformImpossibleIntoPossible(baseMetaclass);

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(final Object element, final Object value) {

-		if (element instanceof BaseMetaclass) {

-

-			if (EditionUtils.hasARequiredCombination((BaseMetaclass) element)) {

-				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.IsPossibleColumnEditingSupport_0, Messages.IsPossibleColumnEditingSupport_1);

-

-			} else {

-

-				ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-				try {

-					dialog.run(false, false, new IRunnableWithProgress() {

-

-						@Override

-						public void run(IProgressMonitor monitor) {

-							monitor.beginTask(Messages.IsPossibleColumnEditingSupport_2, IProgressMonitor.UNKNOWN);

-

-							if ((Boolean) value == true) {

-								transformAllImpossibleIntoPossible((BaseMetaclass) element);

-							} else {

-								transformAllPossibleIntoImpossible((BaseMetaclass) element);

-

-							}

-

-							Facade facade = ((BaseMetaclass) element).getExtensionDefinition().getFacade();

-

-							// Clear incompatibilities that don't exist anymore

-							EditionUtils.clearAllStereotypeCombinations(facade, editingDomain);

-							// Init new incompatibilities

-							EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

-

-							monitor.done();

-						}

-					});

-				} catch (InvocationTargetException e) {

-					e.printStackTrace();

-				} catch (InterruptedException e) {

-					e.printStackTrace();

-				}

-

-				getViewer().refresh();

-			}

-		}

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		if (element instanceof BaseMetaclass) {

-			if (!((BaseMetaclass) element).getExtensionDefinition().getExtension().isRequired()) {

-				return new CheckboxCellEditor(parent);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof BaseMetaclass) {

-			return Boolean.valueOf(((BaseMetaclass) element).isPossible());

-		}

-		return null;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java
deleted file mode 100644
index 4dde7a1ca54..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.swt.widgets.Composite;

-

-public class MetaclassAliasColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public MetaclassAliasColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualElement) {

-			SetCommand command = new SetCommand(editingDomain, (VirtualElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_AliasName(), (String) value);

-			editingDomain.getCommandStack().execute(command);

-			getViewer().refresh();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualElement) {

-			if (((VirtualElement) element).getAliasName() == null) {

-				return ""; //$NON-NLS-1$

-			} else {

-				return ((VirtualElement) element).getAliasName();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		return new TextCellEditor(parent);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java
deleted file mode 100644
index 1b04f4ac7dd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

-import org.eclipse.swt.widgets.Composite;

-

-public class MetaclassIsAbstractColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public MetaclassIsAbstractColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		if (element instanceof VirtualMetaclass) {

-

-			if (MetamodelUtils.canBeAbstract((VirtualMetaclass) element)) {

-				return new CheckboxCellEditor(parent);

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualMetaclass) {

-			return Boolean.valueOf(((VirtualMetaclass) element).isAbstract());

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualMetaclass) {

-

-			SetCommand command = new SetCommand(editingDomain, (VirtualMetaclass) element, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Abstract(), (Boolean) value);

-			editingDomain.getCommandStack().execute(command);

-			getViewer().refresh();

-

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java
deleted file mode 100644
index a8650e00470..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.PrunerUtils;

-import org.eclipse.swt.widgets.Composite;

-

-public class MetaclassToKeepColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	protected Facade facade;

-

-	public MetaclassToKeepColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent, Facade facade) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-		this.facade = facade;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualElement) {

-

-			VirtualMetamodel metamodel = facade.getVirtualmetamodel();

-

-			if ((Boolean) value == false) {

-				if (PrunerUtils.classifierUnkeep((VirtualElement) element, metamodel, editingDomain)) {

-

-					getViewer().refresh();

-				}

-			} else {

-				SetCommand command = new SetCommand(editingDomain, (VirtualElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), (Boolean) value);

-				editingDomain.getCommandStack().execute(command);

-				getViewer().refresh();

-			}

-

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualElement) {

-			return Boolean.valueOf(((VirtualElement) element).isKept());

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-

-		return new CheckboxCellEditor(parent);

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java
deleted file mode 100644
index 47848246cd8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.swt.widgets.Composite;

-

-public class MetaclassUseRepresentedColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public MetaclassUseRepresentedColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		if (element instanceof VirtualElement) {

-			return new CheckboxCellEditor(parent);

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualElement) {

-			return Boolean.valueOf(((VirtualElement) element).isUseRepresented());

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualMetaclass) {

-

-			SetCommand command = new SetCommand(editingDomain, (VirtualMetaclass) element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_UseRepresented(), (Boolean) value);

-			editingDomain.getCommandStack().execute(command);

-			getViewer().refresh();

-

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java
deleted file mode 100644
index b3fdc0b8d74..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.swt.widgets.Composite;

-

-public class PropertiesAliasColumnEdintingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public PropertiesAliasColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualElement) {

-			SetCommand command = new SetCommand(editingDomain, (VirtualElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_AliasName(), (String) value);

-			editingDomain.getCommandStack().execute(command);

-			getViewer().refresh();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualElement) {

-			if (((VirtualElement) element).getAliasName() == null) {

-				return ""; //$NON-NLS-1$

-			} else {

-				return ((VirtualElement) element).getAliasName();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-

-		return new TextCellEditor(parent);

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java
deleted file mode 100644
index bb0bb73d19f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.MultiplicityElement;

-

-public class PropertiesMaxColumnEdintingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public PropertiesMaxColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualTypedElement) {

-

-			try {

-

-				if (((VirtualTypedElement) element).getRepresentedElement() instanceof MultiplicityElement || ((VirtualTypedElement) element).getRepresentedElement() instanceof ETypedElement) {

-					boolean isOk = false;

-					int intValue = Integer.valueOf((String) value);

-

-					if (intValue >= -1) {

-						int upperReference = 0;

-

-						if (((VirtualTypedElement) element).getRepresentedElement() instanceof MultiplicityElement) {

-							upperReference = ((MultiplicityElement) ((VirtualTypedElement) element).getRepresentedElement()).getUpper();

-

-						} else if (((VirtualTypedElement) element).getRepresentedElement() instanceof ETypedElement) {

-							upperReference = ((ETypedElement) ((VirtualTypedElement) element).getRepresentedElement()).getUpperBound();

-						}

-

-						if (upperReference != -1) {

-							if (intValue != -1) {

-								if (intValue <= upperReference) {

-									isOk = true;

-								}

-							}

-

-						} else {

-							isOk = true;

-						}

-

-						if (isOk) {

-							SetCommand command = new SetCommand(editingDomain, (VirtualTypedElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualTypedElement_Upper(), intValue);

-							editingDomain.getCommandStack().execute(command);

-							getViewer().refresh();

-						} else {

-							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_0, Messages.PropertiesMaxColumnEdintingSupport_1 + upperReference);

-						}

-					} else {

-						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_2, Messages.PropertiesMaxColumnEdintingSupport_3);

-					}

-				}

-

-			} catch (NumberFormatException ex) {

-				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_4, Messages.PropertiesMaxColumnEdintingSupport_5);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualTypedElement) {

-

-			return ((VirtualTypedElement) element).getUpper() + ""; //$NON-NLS-1$

-

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		if (element instanceof VirtualTypedElement) {

-			return new TextCellEditor(parent);

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		if (element instanceof VirtualProperty) {

-			return true;

-		}

-

-		return false;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java
deleted file mode 100644
index d901b677d3b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.MultiplicityElement;

-

-public class PropertiesMinColumnEdintingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public PropertiesMinColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualTypedElement) {

-

-			try {

-

-				if (((VirtualTypedElement) element).getRepresentedElement() instanceof MultiplicityElement || ((VirtualTypedElement) element).getRepresentedElement() instanceof ETypedElement) {

-					boolean isOk = false;

-					int intValue = Integer.valueOf((String) value);

-

-					if (intValue >= -1) {

-						int lowerReference = 0;

-

-						if (((VirtualTypedElement) element).getRepresentedElement() instanceof MultiplicityElement) {

-							lowerReference = ((MultiplicityElement) ((VirtualTypedElement) element).getRepresentedElement()).getLower();

-

-						} else if (((VirtualTypedElement) element).getRepresentedElement() instanceof ETypedElement) {

-							lowerReference = ((ETypedElement) ((VirtualTypedElement) element).getRepresentedElement()).getLowerBound();

-						}

-

-						if (lowerReference != -1) {

-							if (intValue >= lowerReference) {

-								isOk = true;

-							}

-						}

-

-						if (isOk) {

-							SetCommand command = new SetCommand(editingDomain, (VirtualTypedElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualTypedElement_Lower(), intValue);

-							editingDomain.getCommandStack().execute(command);

-							getViewer().refresh();

-						} else {

-							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_0, Messages.PropertiesMinColumnEdintingSupport_1 + lowerReference);

-						}

-					} else {

-						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_2, Messages.PropertiesMinColumnEdintingSupport_3);

-					}

-				}

-

-			} catch (NumberFormatException ex) {

-				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_4, Messages.PropertiesMinColumnEdintingSupport_5);

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualTypedElement) {

-

-			return ((VirtualTypedElement) element).getLower() + ""; //$NON-NLS-1$

-

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		if (element instanceof VirtualTypedElement) {

-			return new TextCellEditor(parent);

-		}

-

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		if (element instanceof VirtualProperty) {

-			return true;

-		}

-

-		return false;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java
deleted file mode 100644
index 9ad46add07e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Property;

-

-public class PropertiesToKeepColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public PropertiesToKeepColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(Object element, Object value) {

-		if (element instanceof VirtualElement) {

-			boolean canBeUnkept = true;

-			if (element instanceof VirtualProperty) {

-				if (((VirtualElement) element).getRepresentedElement() instanceof EStructuralFeature) {

-					if (((EStructuralFeature) ((VirtualElement) element).getRepresentedElement()).getLowerBound() > 0) {

-						canBeUnkept = false;

-						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesToKeepColumnEditingSupport_0, Messages.PropertiesToKeepColumnEditingSupport_1);

-					}

-				} else if (((VirtualElement) element).getRepresentedElement() instanceof Property) {

-					if (((Property) ((VirtualElement) element).getRepresentedElement()).getLower() > 0) {

-						canBeUnkept = false;

-						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesToKeepColumnEditingSupport_2, Messages.PropertiesToKeepColumnEditingSupport_3);

-					}

-				}

-

-			}

-

-			if (canBeUnkept) {

-				SetCommand command = new SetCommand(editingDomain, (VirtualElement) element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), (Boolean) value);

-				editingDomain.getCommandStack().execute(command);

-				getViewer().refresh();

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof VirtualElement) {

-			return Boolean.valueOf(((VirtualElement) element).isKept());

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		return new CheckboxCellEditor(parent);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java
deleted file mode 100644
index cb3380d9cbb..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckboxCellEditor;

-import org.eclipse.jface.viewers.ColumnViewer;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Display;

-

-public class StereotypeIncompatibilityColumnEditingSupport extends EditingSupport {

-

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	protected Composite parent;

-

-	public StereotypeIncompatibilityColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

-		super(viewer);

-		this.editingDomain = editingDomain;

-		this.parent = parent;

-	}

-

-	/**

-	 * Change a compatibility between stereotype application to incompatible in the model

-	 *

-	 * @param baseMetaclass

-	 * @param combinaison

-	 */

-	protected void transformCompatibleIntoIncompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

-		AddCommand command = new AddCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combinaison);

-		editingDomain.getCommandStack().execute(command);

-		RemoveCommand removeCommand = new RemoveCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), combinaison);

-		editingDomain.getCommandStack().execute(removeCommand);

-	}

-

-	/**

-	 * Change a compatibility between stereotype application to incompatible in the model

-	 *

-	 * @param baseMetaclass

-	 * @param combinaison

-	 */

-	protected void transformAllCompatibleIntoIncompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

-

-		transformCompatibleIntoIncompatible(baseMetaclass, combinaison);

-	}

-

-	/**

-	 * Change a compatibility between stereotype application to compatible in the model

-	 *

-	 * @param baseMetaclass

-	 * @param combinaison

-	 */

-	protected void transformImcompatibleIntoCompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

-		RemoveCommand removeCommand = new RemoveCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combinaison);

-		editingDomain.getCommandStack().execute(removeCommand);

-		AddCommand addCommand = new AddCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), combinaison);

-		editingDomain.getCommandStack().execute(addCommand);

-	}

-

-	/**

-	 * Change a compatibility between stereotype application to compatible in the model

-	 *

-	 * @param baseMetaclass

-	 * @param combinaison

-	 */

-	protected void transformAllImcompatibleIntoCompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

-

-		transformImcompatibleIntoCompatible(baseMetaclass, combinaison);

-	}

-

-	/**

-	 * Used to propagate compatibilities and incompatibilities among stereotype applications

-	 *

-	 * @param combination

-	 * @param iAmNotARequired

-	 */

-	protected void proceedTheOtherWayCompatibleIntoIncompatible(Combination combination, boolean iAmNotARequired) {

-

-		for (BaseMetaclass meta : combination.getMembers()) {

-			// Build fake Combination that contain all the basemetaclass of the combinaison except the basemetaclass we are processing

-			Combination fakeCombination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-			for (BaseMetaclass metaFake : combination.getMembers()) {

-				if (meta != metaFake) {

-					fakeCombination.getMembers().add(metaFake);

-				}

-			}

-			// fake Combination + the general basemetaclass that own this combinaison

-			if (iAmNotARequired) {

-				BaseMetaclass containerBaseMetaClass = (BaseMetaclass) combination.eContainer();

-				BaseMetaclass general = containerBaseMetaClass;

-				fakeCombination.getMembers().add(general);

-			}

-

-			// if (!EditionUtils.containsOnlyRequired(fakeCombination)) {

-			// We go through the compatible combinaison of this basemeta and try to find the fake

-			Combination combinaison = EditionUtils.getCombinationThatMatch(meta.getCompatibleStereotypes(), fakeCombination);

-			if (combinaison != null) {

-				transformAllCompatibleIntoIncompatible(meta, combinaison);

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.StereotypeIncompatibilityColumnEditingSupport_0);

-			}

-			// }

-		}

-	}

-

-	/**

-	 * Used to propagate compatibilities and incompatibilities among stereotype applications

-	 *

-	 * @param combination

-	 * @param iAmNotARequired

-	 */

-	protected void proceedTheOtherWayImcompatibleIntoCompatible(Combination combination, boolean iAmNotARequired) {

-		for (BaseMetaclass meta : combination.getMembers()) {

-			// Build fake Combination that contain all the basemetaclass of the combinaison except the basemetaclass we are processing

-			Combination fakeCombination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-			for (BaseMetaclass metaFake : combination.getMembers()) {

-				if (meta != metaFake) {

-					fakeCombination.getMembers().add(metaFake);

-				}

-			}

-			// fake Combination + the basemetaclass that own this combinaison

-			if (iAmNotARequired) {

-				BaseMetaclass containerBaseMetaClass = (BaseMetaclass) combination.eContainer();

-				// BaseMetaclass general = findCorrespondingGeneral(containerBaseMetaClass);

-				BaseMetaclass general = containerBaseMetaClass;

-				fakeCombination.getMembers().add(general);

-			}

-

-			// if (!EditionUtils.containsOnlyRequired(fakeCombination)) {

-			// We go through the incompatible combinaison of this basemeta and try to find the fake

-			Combination combinaison = EditionUtils.getCombinationThatMatch(meta.getIncompatibleStereotypes(), fakeCombination);

-			if (combinaison != null) {

-				transformAllImcompatibleIntoCompatible(meta, combinaison);

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.StereotypeIncompatibilityColumnEditingSupport_1);

-			}

-			// }

-

-		}

-	}

-

-	/**

-	 * Set a combination of stereotype application to incompatible

-	 *

-	 * @param baseMetaclass

-	 * @param combination

-	 * @param bothWays

-	 */

-	protected void makeItImcompatible(BaseMetaclass baseMetaclass, Combination combination, boolean bothWays) {

-		transformAllCompatibleIntoIncompatible(baseMetaclass, combination);

-		proceedTheOtherWayCompatibleIntoIncompatible(combination, true);

-	}

-

-	/**

-	 * Set a combination of stereotype application to compatible

-	 *

-	 * @param baseMetaclass

-	 * @param combination

-	 * @param bothWays

-	 */

-	protected void makeItCompatible(BaseMetaclass baseMetaclass, Combination combination, boolean bothWays) {

-		transformAllImcompatibleIntoCompatible(baseMetaclass, combination);

-		proceedTheOtherWayImcompatibleIntoCompatible(combination, true);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

-	 *

-	 * @param element

-	 * @param value

-	 */

-	@Override

-	protected void setValue(final Object element, final Object value) {

-		if (element instanceof Combination) {

-

-			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-			try {

-				dialog.run(false, false, new IRunnableWithProgress() {

-

-					@Override

-					public void run(IProgressMonitor monitor) {

-						monitor.beginTask(Messages.StereotypeIncompatibilityColumnEditingSupport_2, IProgressMonitor.UNKNOWN);

-

-						ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

-						if (selection instanceof IStructuredSelection) {

-							Object first = ((IStructuredSelection) selection).getFirstElement();

-

-							if (first instanceof BaseMetaclass) {

-								BaseMetaclass baseMetaclass = (BaseMetaclass) first;

-

-								if ((Boolean) value == false) {

-									makeItImcompatible(baseMetaclass, (Combination) element, true);

-								} else {

-									// Make it compatible

-									makeItCompatible(baseMetaclass, (Combination) element, true);

-

-								}

-

-							}

-						}

-

-						monitor.done();

-					}

-				});

-			} catch (InvocationTargetException e) {

-				e.printStackTrace();

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-

-			getViewer().refresh();

-			FacadeSpecificEditor.getExtensionDefintionTreeViewer().refresh();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected Object getValue(Object element) {

-		if (element instanceof Combination) {

-			ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

-			if (selection instanceof IStructuredSelection) {

-				Object first = ((IStructuredSelection) selection).getFirstElement();

-

-				if (first instanceof BaseMetaclass) {

-					EList<Combination> incompatibleStereotypes = ((BaseMetaclass) first).getIncompatibleStereotypes();

-					if (incompatibleStereotypes.contains(element)) {

-						return Boolean.valueOf(false);

-					} else {

-						return Boolean.valueOf(true);

-					}

-				}

-			}

-

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected CellEditor getCellEditor(Object element) {

-		return new CheckboxCellEditor(parent);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	protected boolean canEdit(Object element) {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties
deleted file mode 100644
index 80e04f055a3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-EcoreGenerator_10=Don't know how to handle association because wrong number of member end : 

-EcoreGenerator_11=Don't know how to handle association because wrong number of owned member : 

-EcoreGenerator_12=Property : Type not found for : 

-EcoreGenerator_13=Virtual property already processed: 

-EcoreGenerator_14=Problem with elementReprensentingFather kind: 

-EcoreGenerator_15=Problem with representingElement kind: 

-EcoreGenerator_16=Problem with metaclass generalization generation for : 

-EcoreGenerator_17=Generalization already processed: 

-EcoreGenerator_18=EAttribute : Type not found for : 

-EcoreGenerator_19=EReference : Type not found for : 

-EcoreGenerator_20=The kind of represented Property is unknown: 

-EcoreGenerator_21=Problem of type for metaclass properties generation for : 

-EcoreGenerator_22=Problem with metaclass properties generation for : 

-EcoreGenerator_23=Properties already processed: 

-EcoreGenerator_24=createOperations - couldn't find the virtualClassifier that represents the type: 

-EcoreGenerator_25=createOperations - parameters - couldn't find the virtualClassifier that represents the type: 

-EcoreGenerator_26=The kind of oppositeVirtualProperty is unknown: 

-EcoreGenerator_27=Warning : Problem to update eopposite : 

-EcoreGenerator_3=setRepresenting : stereotypes are not only onekind on 

-EcoreGenerator_30=processEAnnotations: couldn't find representing for : 

-EcoreGenerator_31=processEAnnotations: couldn't find corresponding VirtualMetaclass for : 

-EcoreGenerator_35=Generate ecore metamodel

-EcoreGenerator_36=Unknown kind of the classifier: 

-EcoreGenerator_37=This element doesn't have represented element : 

-EcoreGenerator_4=Litral : know the kind of enum literal : 

-EcoreGenerator_40=Validation of the generated metamodel

-EcoreGenerator_41=The generated metamodel seems OK. 

-EcoreGenerator_42=Validation of the generated metamodel

-EcoreGenerator_43=The generated metamodel contains issues that you must fix in the preliminary metamodel. \nYou may open the generated metamodel to spot the problem but don't fix it manualy. 

-EcoreGenerator_44=Metamodel name, nsPrefix and nsURI

-EcoreGenerator_45=Metamodel name, nsPrefix and nsURI must not be empty

-EcoreGenerator_5=Litral : Don't know the kind of enum literal : 

-EcoreGenerator_6=Enum : We don't know the kind of represented Element: 

-EcoreGenerator_9=Datatype : We don't know the kind of represented Element: 

-ExtensionDefintionLabelProvider_13=\ on

-ExtensionKindColumnEditingSupport_0=Updating stereotypes definitions

-ExtensionKindColumnEditingSupport_1=Warning

-ExtensionKindColumnEditingSupport_2=The extension extends an abstract class. The extension cannot be a generalization.

-ExtensionKindColumnEditingSupport_3=Warning

-ExtensionKindColumnEditingSupport_4=The extension is required. The extension cannot be a generalization.

-ExtensionKindColumnEditingSupport_5=Warning

-ExtensionKindColumnEditingSupport_6=Cannot change the extension kind to MultiGeneralization because stereotype is used to  type a property elsewhere. 

-ExtensionKindColumnEditingSupport_7=Warning

-ExtensionKindColumnEditingSupport_8=Cannot change the extension kind to Fusion because stereotype is used to  type a property elsewhere. 

-FacadeSpecificEditor_0=Use represented

-FacadeSpecificEditor_1=Select the Profiles:

-FacadeSpecificEditor_10=Open a real Profile

-FacadeSpecificEditor_11=The model you open is not a profile

-FacadeSpecificEditor_15=Load profile

-FacadeSpecificEditor_16=Open Profile

-FacadeSpecificEditor_17=Clarify extensions

-FacadeSpecificEditor_18=Define metamodel

-FacadeSpecificEditor_19=Create actual metamodel

-FacadeSpecificEditor_2=Profile selection

-FacadeSpecificEditor_21=Name: 

-FacadeSpecificEditor_23=NSPrefix: 

-FacadeSpecificEditor_25=NSURI: 

-FacadeSpecificEditor_27=Generate Ecore metamodel and mapping

-FacadeSpecificEditor_28=Create preliminary metamodel

-FacadeSpecificEditor_29=Metaclass name

-FacadeSpecificEditor_30=To keep

-FacadeSpecificEditor_31=Alias

-FacadeSpecificEditor_32=Make it abstract

-FacadeSpecificEditor_33=Feature name

-FacadeSpecificEditor_34=To keep

-FacadeSpecificEditor_35=Alias

-FacadeSpecificEditor_36=Min

-FacadeSpecificEditor_37=Max

-FacadeSpecificEditor_38=Stereotype name

-FacadeSpecificEditor_39=Kind

-FacadeSpecificEditor_40=Applicable on this metaclass

-FacadeSpecificEditor_41=Stereotype

-FacadeSpecificEditor_42=Is compatible combination

-FacadeSpecificEditor_5=PrimitiveType issue

-FacadeSpecificEditor_6=PrimitiveType 

-FacadeSpecificEditor_7=\ must be stereotype with Ecore::EDataType and instanceTypeName must be specified

-FacadeSpecificEditor_8=Required extension issue

-FacadeSpecificEditor_9=Required extension are not suppported yet.

-IsPossibleColumnEditingSupport_0=Cannot change possibility

-IsPossibleColumnEditingSupport_1=Cannot change because it contains a required metaclass in the combinations

-IsPossibleColumnEditingSupport_2=Updating stereotypes definitions

-MetamodelLabelProvider_8=Unknow

-MetamodelUtils_0=Don't know how to get fathers : 

-MetamodelUtils_1=addMetaclass: didn't add because already represented : 

-MetamodelUtils_10=Can't  create properties for the type : 

-MetamodelUtils_11=postProcessProperties: don't know the representingType for: 

-MetamodelUtils_12=postProcessProperties: don't know the representingType for: 

-MetamodelUtils_13=The kind of the represented element for the virtualProperty is unknown: 

-MetamodelUtils_2=Can't create literal for the type : 

-MetamodelUtils_3=Can't create parameters for the operation : 

-MetamodelUtils_4=addStereotypeInterface: didn't add because already represented : 

-MetamodelUtils_5=Stereotype properties typed by a Class (that are not part of UML metamodel) are not supported yet

-MetamodelUtils_6=Can't process the type : 

-MetamodelUtils_7=Can't process the element for property : 

-MetamodelUtils_8=addProperty: didn't add because already represented : 

-MetamodelUtils_9=Stereotype is already applied to a parent

-PropertiesMaxColumnEdintingSupport_0=Problem with upper bound

-PropertiesMaxColumnEdintingSupport_1=Custom upper bound must be <= 

-PropertiesMaxColumnEdintingSupport_2=Problem with upper bound

-PropertiesMaxColumnEdintingSupport_3=Upper bound must be an between [-1 and +inf[

-PropertiesMaxColumnEdintingSupport_4=Problem with upper bound

-PropertiesMaxColumnEdintingSupport_5=Lower bound must be an integer.

-PropertiesMinColumnEdintingSupport_0=Problem with lower bound

-PropertiesMinColumnEdintingSupport_1=Custom lower bound must be >= 

-PropertiesMinColumnEdintingSupport_2=Problem with upper bound

-PropertiesMinColumnEdintingSupport_3=Lower bound must be an between [-1 and +inf[

-PropertiesMinColumnEdintingSupport_4=Problem with lower bound

-PropertiesMinColumnEdintingSupport_5=Lower bound must be an integer.

-PropertiesToKeepColumnEditingSupport_0=Cannot unkeep this element

-PropertiesToKeepColumnEditingSupport_1=This element cannot be unkept because it is has lower bound > 0. 

-PropertiesToKeepColumnEditingSupport_2=Cannot unkeep this element

-PropertiesToKeepColumnEditingSupport_3=This element cannot be unkept because it is has lower bound > 0. 

-StereotypeIncompatibilityColumnEditingSupport_0=Problem to find combinaison CompatibleIntoIncompatible

-StereotypeIncompatibilityColumnEditingSupport_1=Problem to find combinaison ImcompatibleIntoCompatible

-StereotypeIncompatibilityColumnEditingSupport_2=Updating stereotypes definitions

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java
deleted file mode 100644
index 07b5b8793df..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

-import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.EditionUtils;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.internal.impl.UMLPackageImpl;

-

-public class CreatePreliminaryMetamodelListener extends MouseAdapter {

-

-	Facade facade;

-

-	AdapterFactoryEditingDomain editingDomain;

-

-	protected static EPackage umlMetamodel = UMLPackageImpl.eINSTANCE;

-

-	public CreatePreliminaryMetamodelListener(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		super();

-		this.facade = facade;

-		this.editingDomain = editingDomain;

-	}

-

-	/**

-	 * Interpret the extension as a Generalization and therefore generate the metaclass accordingly

-	 *

-	 * @param extensionDefinition

-	 */

-	protected void initGeneralization(ExtensionDefinition extensionDefinition) {

-

-		BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

-

-		if (baseMetaclass != null) {

-			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

-			stereotypes.add(baseMetaclass);

-			MetamodelUtils.addMetaclass(StereotypeUtils.findBase(extensionDefinition), stereotypes, extensionDefinition.getStereotype().getName(), facade, editingDomain);

-

-			if (MetamodelUtils.hasSiblings(extensionDefinition)) {

-				// Create a Stereotype interface

-				MetamodelUtils.addStereotypeInterface(baseMetaclass.getExtensionDefinition().getStereotype(), baseMetaclass.getExtensionDefinition().getStereotype().getName() + "_applied", facade, editingDomain);

-			}

-

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info("initGeneralization: Error can't find actual base metaclass : " + extensionDefinition.getStereotype());

-		}

-	}

-

-	/**

-	 * Interpret the extension as an Association and therefore generate the metaclass accordingly

-	 *

-	 * @param extensionDefinition

-	 */

-	protected void initAssociation(ExtensionDefinition extensionDefinition) {

-

-		BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

-		if (baseMetaclass != null) {

-			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

-			stereotypes.add(baseMetaclass);

-			String name = ((EClass) baseMetaclass.getBase()).getName() + "_" + baseMetaclass.getExtensionDefinition().getStereotype().getName();

-

-			MetamodelUtils.addMetaclass(baseMetaclass.getBase(), stereotypes, name, facade, editingDomain);

-

-			// Create property in the virtualmetaclass that represents the base metaclass to facilitate navigation

-			if (MetamodelUtils.isActualExtensionDefinition(extensionDefinition)) {

-				// Find the base metaclass

-				VirtualMetaclass virtualMetaclass = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch(baseMetaclass.getBase(), facade);

-				// Add the property

-				MetamodelUtils.addProperty(virtualMetaclass, extensionDefinition.getExtension().getMemberEnds().get(0), extensionDefinition.getExtension().getMemberEnds().get(0).getType(), name, facade, editingDomain);

-			}

-

-			if (MetamodelUtils.hasSiblings(extensionDefinition)) {

-				// Create a Stereotype interface

-				MetamodelUtils.addStereotypeInterface(baseMetaclass.getExtensionDefinition().getStereotype(), baseMetaclass.getExtensionDefinition().getStereotype().getName() + "_applied", facade, editingDomain);

-			}

-		}

-	}

-

-	/**

-	 * Interpret the extension as a MultiGeneralization and therefore generate the metaclass accordingly

-	 *

-	 * @param extensionDefinition

-	 */

-	protected void initMultiGeneralization(ExtensionDefinition extensionDefinition) {

-		// Prepare possible METACLASS combinations

-		HashMap<EClass, ArrayList<Combination>> possibleMetaclasses = new HashMap<EClass, ArrayList<Combination>>();

-

-		for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-

-			ArrayList<Combination> possibleCombinations = new ArrayList<Combination>();

-			if (possibleMetaclasses.containsKey(baseMetaclass.getBase())) {

-				possibleCombinations = possibleMetaclasses.get(baseMetaclass.getBase());

-			}

-

-			// If I am possible I am a combination

-			if (baseMetaclass.isPossible()) {

-				Combination combination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-				combination.getMembers().add(baseMetaclass);

-				if (!EditionUtils.containsCombination(possibleCombinations, combination)) {

-					possibleCombinations.add(combination);

-				}

-			}

-

-			// I take the compatible combination

-			for (Combination possibleCombination : baseMetaclass.getCompatibleStereotypes()) {

-

-				Combination combination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-				combination.getMembers().add(baseMetaclass);

-				combination.getMembers().addAll(possibleCombination.getMembers());

-				if (!EditionUtils.containsCombination(possibleCombinations, combination)) {

-					possibleCombinations.add(combination);

-				}

-

-			}

-

-			possibleMetaclasses.put((EClass) baseMetaclass.getBase(), possibleCombinations);

-

-		}

-

-		// Generate the possible METACLASS combinations

-		for (EClass representedElement : possibleMetaclasses.keySet()) {

-			for (Combination combination : possibleMetaclasses.get(representedElement)) {

-

-				MetamodelUtils.addMetaclass(representedElement, combination.getMembers(), createName(representedElement, combination), facade, editingDomain);

-

-				// Each stereotype that is used in a MultiGeneralization must be declared as a Stereotype interface

-				for (BaseMetaclass baseMetaclass : combination.getMembers()) {

-					Stereotype stereotype = baseMetaclass.getExtensionDefinition().getStereotype();

-					MetamodelUtils.addStereotypeInterface(stereotype, stereotype.getName() + "_applied", facade, editingDomain);

-				}

-

-			}

-		}

-	}

-

-	/**

-	 * Interpret the extension as a Fusion and therefore generate the metaclass accordingly

-	 *

-	 * @param extensionDefinition

-	 */

-	protected void initFusion(ExtensionDefinition extensionDefinition) {

-

-		if (extensionDefinition.getStereotype().getGenerals().isEmpty()) {

-			// Find virtualmetaclass that will be fusion with

-			VirtualMetaclass toFusionWith = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch(StereotypeUtils.findBase(extensionDefinition), facade);

-

-			BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

-			if (baseMetaclass != null) {

-				// Add the stereotype to fusion to the virtualmetaclasse that represent the base metaclass of the stereotype

-				if (!toFusionWith.getAppliedStereotypes().contains(baseMetaclass)) {

-					toFusionWith.getAppliedStereotypes().add(baseMetaclass);

-				}

-			}

-		} else {

-			// For the stereotype that inherit from the stereotype to fusion with the base metaclss, create corresponding virtualmetaclasses

-			BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

-			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

-			stereotypes.add(baseMetaclass);

-			MetamodelUtils.addMetaclass(StereotypeUtils.findBase(extensionDefinition), stereotypes, extensionDefinition.getStereotype().getName(), facade, editingDomain);

-		}

-	}

-

-	/**

-	 * Generate the prelimenary metamodel on the basis of the clarification of the extensions

-	 */

-	protected void initMetamodel() {

-

-		// Generate for the UML metamodel

-		for (EClassifier classifier : umlMetamodel.getEClassifiers()) {

-			MetamodelUtils.createForType(classifier, facade, editingDomain);

-		}

-

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition.getKind() == ExtensionDefinitionKind.GENERALIZATION) {

-				initGeneralization(extensionDefinition);

-			} else if (extensionDefinition.getKind() == ExtensionDefinitionKind.FUSION) {

-				initFusion(extensionDefinition);

-			} else if (extensionDefinition.getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-				initAssociation(extensionDefinition);

-			} else if (extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-				initMultiGeneralization(extensionDefinition);

-			}

-		}

-

-		// initStereotypeInterfaces();

-

-		initAbstractMetaclasses(MetamodelUtils.getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers()));

-

-		MetamodelUtils.createPropertiesForAll(facade, editingDomain);

-

-		MetamodelUtils.createOperationsForAll(facade, editingDomain);

-

-		MetamodelUtils.createGeneralizations(facade, editingDomain);

-

-		MetamodelUtils.postProcessTypedElements(facade, editingDomain);

-

-		MetamodelUtils.postProcessUseRepresented(facade, editingDomain);

-	}

-

-	// private void initStereotypeInterfaces() {

-	// for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-	// if(classifier instanceof VirtualMetaclass) {

-	// if(!MetamodelUtils.onlyOneKind(((VirtualMetaclass)classifier).getAppliedStereotypes())) {

-	// List<Stereotype> stereotypes = MetamodelUtils.getStereotypesFromBaseMetaclass(((VirtualMetaclass)classifier).getAppliedStereotypes());

-	// if(stereotypes.size() == 1) {

-	//

-	// } else {

-	// org.eclipse.papyrus.facadeSpecificEditor.Activator.log.info("initStereotypeInterfaces: Error with number of different applied stereotypes");

-	// }

-	// }

-	// }

-	// }

-	// }

-

-	/**

-	 * Set the isAbstract value each virtualMetaclass

-	 *

-	 * @param list

-	 */

-	protected void initAbstractMetaclasses(List<VirtualMetaclass> list) {

-		for (VirtualMetaclass metaclass : list) {

-			metaclass.setAbstract(MetamodelUtils.mustBeAbstract(metaclass));

-		}

-	}

-

-	/**

-	 * Generate a name that is meaningful using a combination of applied stereotypes

-	 *

-	 * @param representedElement

-	 * @param combination

-	 * @return

-	 *         a meaningful name

-	 */

-	protected String createName(EClass representedElement, Combination combination) {

-		String name = representedElement.getName();

-

-		for (BaseMetaclass baseMetaclass : combination.getMembers()) {

-			name += "_" + baseMetaclass.getExtensionDefinition().getStereotype().getName();

-		}

-

-		return name;

-	}

-

-	/**

-	 * Check whether two or more required stereotypes are defined as MULTI_GENERALIZATION on a unique base metaclass

-	 *

-	 * @return

-	 */

-	protected boolean isFeasible() {

-

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-				if (extensionDefinition.getExtension().isRequired()) {

-					// Is there another that is required with common basemetaclasses

-					for (ExtensionDefinition extensionDefinition2 : facade.getExtensionDefinitions()) {

-						if (!ProfileUtils.getSiblings(extensionDefinition.getStereotype()).contains(extensionDefinition2.getStereotype())) {

-							if (extensionDefinition2.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-								if (extensionDefinition2.getExtension().isRequired()) {

-									if (extensionDefinition != extensionDefinition2) {

-

-										List<EClass> baseMetaclasses = StereotypeUtils.getAllExtendableMetaclasses(extensionDefinition.getExtension(), true);

-										List<EClass> baseMetaclasses2 = StereotypeUtils.getAllExtendableMetaclasses(extensionDefinition2.getExtension(), true);

-

-										for (EClass eClass : baseMetaclasses) {

-											if (baseMetaclasses2.contains(eClass)) {

-												MessageDialog.openError(Display.getCurrent().getActiveShell(), "Cannot generate metamodel", "Two or more required stereotypes are defined as MULTI_GENERALIZATION on " + eClass.getName()

-														+ ". \nYou must define only one as MultiGeneralization.");

-												return false;

-											}

-										}

-									}

-

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param e

-	 */

-	@Override

-	public void mouseUp(MouseEvent e) {

-		if (isFeasible()) {

-

-			boolean proceed = false;

-			if (facade.getVirtualmetamodel().eContents().isEmpty()) {

-				proceed = true;

-			} else {

-				if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Confirmation", "We are going to erase the preliminary metamodel")) {

-					proceed = true;

-				}

-			}

-

-			if (proceed) {

-				// Command to execute for development only

-				RemoveCommand commandMetaclasses = new RemoveCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), facade.getVirtualmetamodel().getVirtualClassifiers());

-				editingDomain.getCommandStack().execute(commandMetaclasses);

-

-				initMetamodel();

-

-				FacadeSpecificEditor.getMetamodelTreeViewer().refresh();

-			}

-		}

-

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java
deleted file mode 100644
index 2ce33ad2996..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java
+++ /dev/null
@@ -1,962 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

-

-import java.io.IOException;

-import java.lang.reflect.InvocationTargetException;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EParameter;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.Diagnostician;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.EcoreValidator;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingFactory;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.ExtensionEnd;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-

-public class EcoreGenerator extends MouseAdapter {

-

-	Facade facade;

-

-	AdapterFactoryEditingDomain editingDomain;

-

-	protected Resource ecoreResource;

-

-	protected Resource mappingResource;

-

-	protected HashSet<VirtualMetaclass> propertiesProcessed;

-

-	protected HashSet<VirtualMetaclass> generalizationProcessed;

-

-	protected HashMap<VirtualProperty, EObject> processedProperty;

-

-	protected HashMap<VirtualLiteral, EObject> processedLiteral;

-

-	protected HashMap<VirtualClassifier, EClassifier> processedClassifier;

-

-	protected HashMap<VirtualProperty, EStructuralFeature> processedPropertyFeature;

-

-	protected static EPackage ecoreMetamodel = EcorePackage.eINSTANCE;

-

-

-	public EcoreGenerator(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		super();

-		this.facade = facade;

-		this.editingDomain = editingDomain;

-

-		propertiesProcessed = new HashSet<VirtualMetaclass>();

-		processedProperty = new HashMap<VirtualProperty, EObject>();

-		processedClassifier = new HashMap<VirtualClassifier, EClassifier>();

-		generalizationProcessed = new HashSet<VirtualMetaclass>();

-		processedLiteral = new HashMap<VirtualLiteral, EObject>();

-		processedPropertyFeature = new HashMap<VirtualProperty, EStructuralFeature>();

-	}

-

-	/**

-	 * Helper method to create the Ecore file for the actual metamodel for the facade

-	 *

-	 * @return

-	 *         the root of the ecore metamodel

-	 */

-	protected EObject createEcoreFile() {

-		URI ecoreURI = facade.eResource().getURI();

-		ecoreURI = ecoreURI.trimSegments(1);

-		ecoreURI = ecoreURI.appendSegment(facade.getVirtualmetamodel().getName() + ".ecore"); //$NON-NLS-1$

-

-		ResourceSet resourceSet = new ResourceSetImpl();

-		ecoreResource = resourceSet.createResource(ecoreURI);

-

-		ecoreResource.getContents().clear();

-		EPackage root = EcoreFactory.eINSTANCE.createEPackage();

-		root.setName(facade.getVirtualmetamodel().getName());

-		root.setNsPrefix(facade.getVirtualmetamodel().getNsPrefix());

-		root.setNsURI(facade.getVirtualmetamodel().getNsURI());

-		ecoreResource.getContents().add(root);

-

-		EObject ecoreModel = ecoreResource.getContents().get(0);

-

-		return ecoreModel;

-	}

-

-	/**

-	 * Helper method to create the mapping file between UML + profile and the facade metamodel

-	 *

-	 * @return

-	 *         the root of the mapping model

-	 */

-	protected EObject createMappingFile() {

-		URI ecoreURI = facade.eResource().getURI();

-		ecoreURI = ecoreURI.trimSegments(1);

-		ecoreURI = ecoreURI.appendSegment(facade.getVirtualmetamodel().getName() + ".facademapping"); //$NON-NLS-1$

-

-		ResourceSet resourceSet = new ResourceSetImpl();

-		mappingResource = resourceSet.createResource(ecoreURI);

-

-		mappingResource.getContents().clear();

-		FacadeMappping root = FacademappingFactory.eINSTANCE.createFacadeMappping();

-		mappingResource.getContents().add(root);

-

-		EObject mappingModel = mappingResource.getContents().get(0);

-

-		return mappingModel;

-	}

-

-	/**

-	 * Helper method to save the the Ecore facade metamodel file and the the mapping model

-	 */

-	protected void save() {

-		try {

-			Map<Object, Object> options = new HashMap<Object, Object>();

-			options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

-			ecoreResource.save(options);

-			mappingResource.save(options);

-		} catch (IOException e1) {

-			e1.printStackTrace();

-		}

-	}

-

-	/**

-	 * Store a mapping in the mapping model

-	 *

-	 * @param element

-	 * @param representingElement

-	 * @param facadeMappingModel

-	 */

-	protected void setRepresenting(VirtualElement element, EObject representingElement, FacadeMappping facadeMappingModel) {

-

-		if (element instanceof VirtualMetaclass) {

-			if (!((VirtualMetaclass) element).getAppliedStereotypes().isEmpty()) {

-

-				StereotypedMapping mappingToEdit = FacademappingFactory.eINSTANCE.createStereotypedMapping();

-

-				List<Stereotype> stereotypes = new ArrayList<Stereotype>();

-

-				for (BaseMetaclass baseMetaclass : ((VirtualMetaclass) element).getAppliedStereotypes()) {

-					stereotypes.add(baseMetaclass.getExtensionDefinition().getStereotype());

-				}

-

-				if (MetamodelUtils.onlyOneKind(((VirtualMetaclass) element).getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

-					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.ASSOCIATION);

-				} else if (MetamodelUtils.onlyOneKind(((VirtualMetaclass) element).getAppliedStereotypes(), ExtensionDefinitionKind.GENERALIZATION)) {

-					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.GENERALIZATION);

-				} else if (MetamodelUtils.onlyOneKind(((VirtualMetaclass) element).getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION)) {

-					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.MULTI_GENERALIZATION);

-				} else if (MetamodelUtils.onlyOneKind(((VirtualMetaclass) element).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

-					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.FUSION);

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_3 + element.getRepresentedElement());

-				}

-

-				mappingToEdit.setUmlElement(element.getRepresentedElement());

-				mappingToEdit.setSpecificDomainElement(representingElement);

-				mappingToEdit.getAppliedStereotypes().addAll(stereotypes);

-

-				facadeMappingModel.getMappings().add(mappingToEdit);

-

-				return;

-			}

-		}

-

-		Mapping mapping = FacademappingFactory.eINSTANCE.createMapping();

-		mapping.setUmlElement(element.getRepresentedElement());

-		mapping.setSpecificDomainElement(representingElement);

-

-		facadeMappingModel.getMappings().add(mapping);

-	}

-

-	/**

-	 * Create an EEnum from an VirtualEnum in the facade metamodel

-	 *

-	 * @param virtualEnum

-	 * @param ecoreRoot

-	 * @param facadeMappping

-	 */

-	protected void createEnum(VirtualEnum virtualEnum, EPackage ecoreRoot, FacadeMappping facadeMappping) {

-		if (virtualEnum.getRepresentedElement() instanceof EEnum) {

-

-			EEnum enumeration = EcoreFactory.eINSTANCE.createEEnum();

-			enumeration.setName(virtualEnum.getAliasName());

-

-			for (VirtualLiteral literal : virtualEnum.getLiterals()) {

-				if (literal.getRepresentedElement() instanceof EEnumLiteral) {

-					EEnumLiteral enumLiteral = EcoreFactory.eINSTANCE.createEEnumLiteral();

-					enumLiteral.setName(literal.getAliasName());

-

-					enumLiteral.setValue(((EEnumLiteral) literal.getRepresentedElement()).getValue());

-					enumeration.getELiterals().add(enumLiteral);

-					setRepresenting(literal, enumLiteral, facadeMappping);

-					processedLiteral.put(literal, enumLiteral);

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_4 + virtualEnum.getRepresentedElement());

-				}

-			}

-

-			ecoreRoot.getEClassifiers().add(enumeration);

-			setRepresenting(virtualEnum, enumeration, facadeMappping);

-			processedClassifier.put(virtualEnum, enumeration);

-

-		} else if (virtualEnum.getRepresentedElement() instanceof Enumeration) {

-			EEnum enumeration = EcoreFactory.eINSTANCE.createEEnum();

-			enumeration.setName(virtualEnum.getAliasName());

-

-			int i = 0;

-			for (VirtualLiteral literal : virtualEnum.getLiterals()) {

-				if (literal.getRepresentedElement() instanceof EnumerationLiteral) {

-					EEnumLiteral enumLiteral = EcoreFactory.eINSTANCE.createEEnumLiteral();

-					enumLiteral.setName(literal.getAliasName());

-

-					enumLiteral.setValue(i);

-					enumeration.getELiterals().add(enumLiteral);

-					setRepresenting(literal, enumLiteral, facadeMappping);

-					processedLiteral.put(literal, enumLiteral);

-					i++;

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_5 + literal.getRepresentedElement());

-				}

-			}

-

-			ecoreRoot.getEClassifiers().add(enumeration);

-			setRepresenting(virtualEnum, enumeration, facadeMappping);

-			processedClassifier.put(virtualEnum, enumeration);

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_6 + virtualEnum.getRepresentedElement());

-		}

-	}

-

-	/**

-	 * Create an EDatatype from an VirtualDatatype in the facade metamodel

-	 *

-	 * @param datatype

-	 * @param ecoreRoot

-	 * @param facadeMappping

-	 */

-	protected void createDatatype(VirtualDatatype datatype, EPackage ecoreRoot, FacadeMappping facadeMappping) {

-		if (datatype.getRepresentedElement() instanceof EDataType) {

-			EDataType eDataType = EcoreFactory.eINSTANCE.createEDataType();

-			eDataType.setName(datatype.getAliasName());

-			eDataType.setInstanceTypeName(((EDataType) datatype.getRepresentedElement()).getInstanceTypeName());

-

-			ecoreRoot.getEClassifiers().add(eDataType);

-			setRepresenting(datatype, eDataType, facadeMappping);

-			processedClassifier.put(datatype, eDataType);

-		}

-		if (datatype.getRepresentedElement() instanceof PrimitiveType) {

-			EDataType eDataType = EcoreFactory.eINSTANCE.createEDataType();

-			eDataType.setName(datatype.getAliasName());

-

-			Stereotype stereotype = ((PrimitiveType) datatype.getRepresentedElement()).getAppliedStereotype("Ecore::EDataType"); //$NON-NLS-1$

-			if (stereotype != null) {

-				Object value = ((PrimitiveType) datatype.getRepresentedElement()).getValue(stereotype, "instanceClassName"); //$NON-NLS-1$

-				if (value instanceof String) {

-					eDataType.setInstanceTypeName((String) value);

-				}

-			}

-

-			ecoreRoot.getEClassifiers().add(eDataType);

-			setRepresenting(datatype, eDataType, facadeMappping);

-			processedClassifier.put(datatype, eDataType);

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_9 + datatype.getRepresentedElement());

-		}

-	}

-

-	/**

-	 * Create an EClass from an VirtualMetaclass in the facade metamodel

-	 *

-	 * @param metaclass

-	 * @param ecoreRoot

-	 * @param facadeMappping

-	 */

-	protected void createMetaclass(VirtualMetaclass metaclass, EPackage ecoreRoot, FacadeMappping facadeMappping) {

-

-		if (!processedClassifier.containsKey(metaclass)) {

-			EClass eClass = EcoreFactory.eINSTANCE.createEClass();

-			eClass.setName(metaclass.getAliasName());

-			eClass.setAbstract(metaclass.isAbstract());

-

-			ecoreRoot.getEClassifiers().add(eClass);

-

-			setRepresenting(metaclass, eClass, facadeMappping);

-			processedClassifier.put(metaclass, eClass);

-		}

-	}

-

-	/**

-	 * Add a boolean attribute to a representingElement in the facade metamodel

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void createBooleanAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

-		attrib.setName(virtualProperty.getAliasName());

-		attrib.setLowerBound(virtualProperty.getLower());

-		attrib.setUpperBound(virtualProperty.getUpper());

-		attrib.setEType(EcorePackage.Literals.EBOOLEAN);

-

-		representingElement.getEStructuralFeatures().add(attrib);

-		setRepresenting(virtualProperty, attrib, facadeMappping);

-		processedPropertyFeature.put(virtualProperty, attrib);

-	}

-

-	/**

-	 * Add a String attribute to a representingElement in the facade metamodel

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void createStringAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

-		attrib.setName(virtualProperty.getAliasName());

-		attrib.setLowerBound(virtualProperty.getLower());

-		attrib.setUpperBound(virtualProperty.getUpper());

-		attrib.setEType(EcorePackage.Literals.ESTRING);

-

-		representingElement.getEStructuralFeatures().add(attrib);

-		setRepresenting(virtualProperty, attrib, facadeMappping);

-		processedPropertyFeature.put(virtualProperty, attrib);

-	}

-

-	/**

-	 * Add an integer attribute to a representingElement in the facade metamodel

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void createIntegerAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

-		attrib.setName(virtualProperty.getAliasName());

-		attrib.setLowerBound(virtualProperty.getLower());

-		attrib.setUpperBound(virtualProperty.getUpper());

-		attrib.setEType(EcorePackage.Literals.EINT);

-

-		representingElement.getEStructuralFeatures().add(attrib);

-		setRepresenting(virtualProperty, attrib, facadeMappping);

-		processedPropertyFeature.put(virtualProperty, attrib);

-	}

-

-	/**

-	 * Add an unlimitedNatural attribute to a representingElement in the facade metamodel

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void createUnlimitedNaturalAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-		createIntegerAttribute(virtualProperty, representingElement, facadeMappping);

-	}

-

-	/**

-	 * Add a real attribute to a representingElement in the facade metamodel

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void createRealAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

-		attrib.setName(virtualProperty.getAliasName());

-		attrib.setLowerBound(virtualProperty.getLower());

-		attrib.setUpperBound(virtualProperty.getUpper());

-		attrib.setEType(EcorePackage.Literals.EFLOAT);

-

-		representingElement.getEStructuralFeatures().add(attrib);

-		setRepresenting(virtualProperty, attrib, facadeMappping);

-		processedPropertyFeature.put(virtualProperty, attrib);

-	}

-

-	/**

-	 * Generate a eAttribute of eReference in the facade metamodel to represent a virtualProperty

-	 *

-	 * @param virtualProperty

-	 * @param representingElement

-	 * @param facadeMappping

-	 */

-	protected void processPropertyFeature(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

-

-		if (!processedPropertyFeature.containsKey(virtualProperty)) {

-			Property property = (Property) virtualProperty.getRepresentedElement();

-

-			EObject eType = StereotypeUtils.findEClass((Classifier) property.getType());

-

-			if (eType == TypesPackage.eINSTANCE.getBoolean()) {

-				createBooleanAttribute(virtualProperty, representingElement, facadeMappping);

-			} else if (eType == TypesPackage.eINSTANCE.getString()) {

-				createStringAttribute(virtualProperty, representingElement, facadeMappping);

-			} else if (eType == TypesPackage.eINSTANCE.getInteger()) {

-				createIntegerAttribute(virtualProperty, representingElement, facadeMappping);

-			} else if (eType == TypesPackage.eINSTANCE.getUnlimitedNatural()) {

-				createUnlimitedNaturalAttribute(virtualProperty, representingElement, facadeMappping);

-			} else if (eType == TypesPackage.eINSTANCE.getReal()) {

-				createRealAttribute(virtualProperty, representingElement, facadeMappping);

-			} else {

-				EClassifier representingType = null;

-				if (eType != null) {

-					if (eType instanceof EClassifier) {

-						VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(eType, facade);

-						representingType = processedClassifier.get(typeVirtualMetaclass);

-					}

-				} else if (property instanceof ExtensionEnd) {

-					Property otherEnd = ((ExtensionEnd) property).getOtherEnd();

-					VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findMetaclassThatMatch(StereotypeUtils.findEClass((Classifier) otherEnd.getType()), (Stereotype) property.getType(), facade);

-					representingType = processedClassifier.get(typeVirtualMetaclass);

-				} else {

-					VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(property.getType(), facade);

-					representingType = processedClassifier.get(typeVirtualMetaclass);

-				}

-

-				if (representingType != null) {

-					EStructuralFeature attrib;

-					if (representingType instanceof EDataType) {

-						attrib = EcoreFactory.eINSTANCE.createEAttribute();

-					} else {

-						attrib = EcoreFactory.eINSTANCE.createEReference();

-					}

-

-					attrib.setName(virtualProperty.getAliasName());

-					attrib.setLowerBound(virtualProperty.getLower());

-					attrib.setUpperBound(virtualProperty.getUpper());

-

-					if (attrib instanceof EReference) {

-						if (virtualProperty.getRepresentedElement() instanceof Property) {

-							if (((Property) virtualProperty.getRepresentedElement()).getClass_() instanceof Stereotype) {

-								if (!(((Property) virtualProperty.getRepresentedElement()).getType() instanceof Stereotype) && !(((Property) virtualProperty.getRepresentedElement()).getAssociation() instanceof Extension)) {

-									if (((Property) virtualProperty.getRepresentedElement()).getType().eClass().getEPackage() != UMLPackage.eINSTANCE) {

-										((EReference) attrib).setContainment(true);

-									}

-								}

-							}

-

-							if (virtualProperty.getRepresentedElement() instanceof ExtensionEnd) {

-								((EReference) attrib).setContainment(true);

-							}

-						}

-					}

-

-					if (property.getAssociation() != null) {

-						if (property.getAssociation().getOwnedEnds().size() == 1) {

-							if (property.getAssociation().getMemberEnds().size() == 2) {

-								// Do nothing

-							} else {

-								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_10 + property.getAssociation());

-							}

-						} else {

-							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_11 + property.getAssociation());

-						}

-					}

-

-					attrib.setEType(representingType);

-

-					representingElement.getEStructuralFeatures().add(attrib);

-					setRepresenting(virtualProperty, attrib, facadeMappping);

-					// updateRepresenting(property, attrib, facadeMappping);

-					processedPropertyFeature.put(virtualProperty, attrib);

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_12 + property);

-				}

-

-			}

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_13 + virtualProperty);

-		}

-

-	}

-

-	/**

-	 * Create the generalization relationships of a representingElement of a virtualMetaclass

-	 *

-	 * @param metaclass

-	 * @param root

-	 * @param facadeMappping

-	 */

-	protected void createGeneralisations(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

-

-		if (!generalizationProcessed.contains(metaclass)) {

-			EObject representingElement = processedClassifier.get(metaclass);

-			if (representingElement != null) {

-

-				generalizationProcessed.add(metaclass);

-

-				// Add generalization

-				for (VirtualMetaclass father : metaclass.getParents()) {

-					EObject elementReprensentingFather = processedClassifier.get(father);

-					if (representingElement instanceof EClass) {

-						if (elementReprensentingFather instanceof EClass) {

-							((EClass) representingElement).getESuperTypes().add((EClass) elementReprensentingFather);

-						} else {

-							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_14 + elementReprensentingFather);

-						}

-					} else {

-						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_15 + representingElement);

-					}

-				}

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_16 + metaclass);

-			}

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_17 + metaclass);

-		}

-	}

-

-	/**

-	 * Generate the properties in the facade metamodel from virtualmetaclass

-	 *

-	 * @param metaclass

-	 * @param root

-	 * @param facadeMappping

-	 */

-	protected void createProperties(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

-

-		if (!propertiesProcessed.contains(metaclass)) {

-			EObject representingElement = processedClassifier.get(metaclass);

-			if (representingElement != null) {

-

-				propertiesProcessed.add(metaclass);

-

-				// Create features

-				if (representingElement instanceof EClass) {

-					for (VirtualProperty property : metaclass.getProperties()) {

-						if (property.isKept()) {

-

-							if (property.getRepresentedElement() instanceof EAttribute) {

-								VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(((EAttribute) property.getRepresentedElement()).getEType(), facade);

-								EClassifier representingType = processedClassifier.get(typeVirtualMetaclass);

-								if (representingType != null) {

-									EAttribute attrib = (EAttribute) EcoreUtil.copy(property.getRepresentedElement());

-									attrib.setName(property.getAliasName());

-									attrib.setEType(representingType);

-

-									((EClass) representingElement).getEStructuralFeatures().add(attrib);

-

-									setRepresenting(property, attrib, facadeMappping);

-									processedProperty.put(property, attrib);

-								} else {

-									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_18 + property);

-								}

-							} else if (property.getRepresentedElement() instanceof EReference) {

-								VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(((EReference) property.getRepresentedElement()).getEType(), facade);

-								EClassifier representingType = processedClassifier.get(typeVirtualMetaclass);

-								if (representingType != null) {

-									EReference attrib = (EReference) EcoreUtil.copy(property.getRepresentedElement());

-									attrib.setName(property.getAliasName());

-									attrib.setEType(representingType);

-

-									((EClass) representingElement).getEStructuralFeatures().add(attrib);

-

-									setRepresenting(property, attrib, facadeMappping);

-									processedProperty.put(property, attrib);

-								} else {

-									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_19 + property);

-								}

-							} else if (property.getRepresentedElement() instanceof Property) {

-								processPropertyFeature(property, (EClass) representingElement, facadeMappping);

-							} else {

-								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_20 + property.getRepresentedElement());

-							}

-						}

-					}

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_21 + metaclass);

-				}

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_22 + metaclass);

-			}

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_23 + metaclass);

-		}

-

-	}

-

-	/**

-	 * Generate the operations in the facade metamodel from virtualmetaclass

-	 *

-	 * @param metaclass

-	 * @param root

-	 * @param facadeMappping

-	 */

-	protected void createOperations(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

-		for (VirtualOperation virtualOperation : metaclass.getOperations()) {

-			if (virtualOperation.isKept()) {

-				EClassifier representing = processedClassifier.get(metaclass);

-

-				if (representing instanceof EClass) {

-					if (virtualOperation.getRepresentedElement() instanceof EOperation) {

-						EOperation eOperation = (EOperation) EcoreUtil.copy(virtualOperation.getRepresentedElement());

-						eOperation.getEParameters().clear();

-						eOperation.setName(virtualOperation.getAliasName());

-						((EClass) representing).getEOperations().add(eOperation);

-

-						setRepresenting(virtualOperation, eOperation, facadeMappping);

-

-						if (eOperation.getEType() != null) {

-							if (eOperation.getEType().getEPackage() == UMLPackage.eINSTANCE || eOperation.getEType().getEPackage() == TypesPackage.eINSTANCE) {

-								VirtualClassifier virtualClassifier = MetamodelUtils.findClassifierThatMatch(eOperation.getEType(), facade);

-								if (virtualClassifier != null) {

-									eOperation.setEType(processedClassifier.get(virtualClassifier));

-								} else {

-									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_24 + eOperation.getEType());

-								}

-							}

-						}

-

-						for (VirtualParameter virtualParameter : virtualOperation.getParameters()) {

-							EParameter eParameter = (EParameter) EcoreUtil.copy(virtualParameter.getRepresentedElement());

-

-							eParameter.setName(virtualParameter.getAliasName());

-							eParameter.setLowerBound(virtualParameter.getLower());

-							eParameter.setUpperBound(virtualParameter.getUpper());

-							setRepresenting(virtualParameter, eParameter, facadeMappping);

-							if (eParameter.getEType() != null) {

-								if (eParameter.getEType().getEPackage() == UMLPackage.eINSTANCE || eParameter.getEType().getEPackage() == TypesPackage.eINSTANCE) {

-									VirtualClassifier virtualClassifier = MetamodelUtils.findClassifierThatMatch(eParameter.getEType(), facade);

-									if (virtualClassifier != null) {

-										eParameter.setEType(processedClassifier.get(virtualClassifier));

-									} else {

-										org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_25 + eOperation.getEType());

-									}

-								}

-							}

-							eOperation.getEParameters().add(eParameter);

-						}

-

-						EList<EAnnotation> annotation = ((EModelElement) virtualOperation.getRepresentedElement()).getEAnnotations();

-						for (EAnnotation eAnnotation : annotation) {

-							eOperation.getEAnnotations().add(EcoreUtil.copy(eAnnotation));

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Find the representing eReference that is the eOpposite of a eReference

-	 *

-	 * @param reference

-	 * @return

-	 */

-	protected EReference findEOpposite(EReference reference) {

-		VirtualMetaclass oppositeTypeVirtualMetaclass = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch(reference.eContainer(), facade);

-

-		VirtualProperty oppositeVirtualProperty = null;

-

-		if (oppositeTypeVirtualMetaclass != null) {

-			for (VirtualProperty virtualProperty : oppositeTypeVirtualMetaclass.getProperties()) {

-				EObject virtualPropertyRepresentedElement = virtualProperty.getRepresentedElement();

-

-				if (virtualPropertyRepresentedElement instanceof ENamedElement) {

-					if (((ENamedElement) virtualPropertyRepresentedElement).getName().equals(reference.getName())) {

-						oppositeVirtualProperty = virtualProperty;

-						break;

-					}

-				} else if (virtualPropertyRepresentedElement instanceof ExtensionEnd) {

-

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_26 + virtualPropertyRepresentedElement);

-				}

-			}

-

-			if (oppositeVirtualProperty != null) {

-				if (processedProperty.containsKey(oppositeVirtualProperty)) {

-					if (processedProperty.get(oppositeVirtualProperty) instanceof EReference) {

-						return (EReference) processedProperty.get(oppositeVirtualProperty);

-					}

-				}

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Find the facade element that represents a umlElement

-	 *

-	 * @param umlElement

-	 * @param facadeMappping

-	 * @return

-	 */

-	protected EObject findRepresenting(EObject umlElement, FacadeMappping facadeMappping) {

-		for (Mapping mapping : facadeMappping.getMappings()) {

-			if (mapping.getUmlElement() == umlElement) {

-				return mapping.getSpecificDomainElement();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Update the eOpposite among eReferences in the facade metamodel

-	 *

-	 * @param root

-	 * @param facadeMappping

-	 */

-	protected void processEOpposites(EPackage root, FacadeMappping facadeMappping) {

-		TreeIterator<EObject> it = root.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-			if (eObject instanceof EReference) {

-				EReference reference = (EReference) eObject;

-

-				EReference eOpposite = reference.getEOpposite();

-

-				if (eOpposite != null) {

-					EReference representingEOpposite = findEOpposite(eOpposite);

-					if (representingEOpposite == null) {

-						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_27 + eOpposite);

-					}

-					reference.setEOpposite(representingEOpposite);

-				} else {

-					for (Mapping mapping : facadeMappping.getMappings()) {

-						if (mapping.getSpecificDomainElement() == eObject) {

-							EObject umlElement = mapping.getUmlElement();

-							if (umlElement instanceof Property) {

-								Property otherEnd = ((Property) umlElement).getOtherEnd();

-								if (otherEnd != null) {

-									EObject otherEndRepresenting = findRepresenting(otherEnd, facadeMappping);

-									if (otherEndRepresenting instanceof EReference) {

-										reference.setEOpposite((EReference) otherEndRepresenting);

-									}

-

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Copy significant EAnnotations from represented element to representing elements in the facade metamodel

-	 *

-	 * @param root

-	 */

-	protected void processEAnnotations(EPackage root) {

-		TreeIterator<EObject> it = root.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-

-			if (eObject instanceof EAnnotation) {

-				String source = ((EAnnotation) eObject).getSource();

-				if (source.equals("subsets") || source.equals("redefines")) { //$NON-NLS-1$ //$NON-NLS-2$

-					ArrayList<EObject> newList = new ArrayList<EObject>();

-					for (EObject reference : ((EAnnotation) eObject).getReferences()) {

-

-						VirtualProperty correspondingVirtualProperty = MetamodelUtils.findProperty(reference, facade);

-						if (correspondingVirtualProperty != null) {

-							EObject representing = processedProperty.get(correspondingVirtualProperty);

-							if (representing != null) {

-								newList.add(representing);

-							} else {

-								representing = processedPropertyFeature.get(correspondingVirtualProperty);

-								if (representing != null) {

-									newList.add(representing);

-								} else {

-									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_30 + correspondingVirtualProperty);

-								}

-							}

-						} else {

-							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_31 + reference);

-						}

-					}

-

-					((EAnnotation) eObject).getReferences().clear();

-					((EAnnotation) eObject).getReferences().addAll(newList);

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void mouseUp(MouseEvent event) {

-		if (!facade.getVirtualmetamodel().getName().equals("") && !facade.getVirtualmetamodel().getNsPrefix().equals("") && !facade.getVirtualmetamodel().getNsURI().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-

-			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-			try {

-				dialog.run(false, false, new IRunnableWithProgress() {

-

-					@Override

-					public void run(IProgressMonitor monitor) {

-						monitor.beginTask(Messages.EcoreGenerator_35, IProgressMonitor.UNKNOWN);

-

-						propertiesProcessed.clear();

-						generalizationProcessed.clear();

-						processedProperty.clear();

-						processedLiteral.clear();

-						processedClassifier.clear();

-						processedPropertyFeature.clear();

-

-						// Create files

-						EObject ecoreModel = createEcoreFile();

-						EObject facadeMapppingModel = createMappingFile();

-

-						if (ecoreModel instanceof EPackage) {

-							EPackage root = (EPackage) ecoreModel;

-							if (facadeMapppingModel instanceof FacadeMappping) {

-								FacadeMappping facadeMappping = (FacadeMappping) facadeMapppingModel;

-

-								// Create metaclasses first

-								for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-									if (classifier.isKept()) {

-										if (!classifier.isUseRepresented()) {

-											if (classifier instanceof VirtualMetaclass) {

-												createMetaclass((VirtualMetaclass) classifier, root, facadeMappping);

-											} else if (classifier instanceof VirtualEnum) {

-												createEnum((VirtualEnum) classifier, root, facadeMappping);

-											} else if (classifier instanceof VirtualDatatype) {

-												createDatatype((VirtualDatatype) classifier, root, facadeMappping);

-											} else {

-												org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_36 + classifier);

-											}

-										}

-									}

-								}

-

-								// Hierarchy and features among metaclasses

-								for (VirtualMetaclass metaclass : MetamodelUtils.getOnlyVirtualMetaclasses(processedClassifier.keySet())) {

-									createGeneralisations(metaclass, root, facadeMappping);

-									createProperties(metaclass, root, facadeMappping);

-									createOperations(metaclass, root, facadeMappping);

-								}

-

-								// Process eOpposites

-								processEOpposites(root, facadeMappping);

-

-								// Clean eAnnotations

-								processEAnnotations(root);

-

-								Diagnostic diagnostic = Diagnostician.INSTANCE.validate(root);

-

-								for (Diagnostic child : diagnostic.getChildren()) {

-									if (child.getCode() == EcoreValidator.DISJOINT_FEATURE_AND_OPERATION_SIGNATURES) {

-										for (Object dataElement : child.getData()) {

-											if (dataElement instanceof EOperation) {

-												EcoreUtil.setSuppressedVisibility((EOperation) dataElement, true);

-											}

-										}

-									}

-								}

-

-								diagnostic = Diagnostician.INSTANCE.validate(root);

-

-								// Sanity check

-								TreeIterator<EObject> it = facade.eAllContents();

-								while (it.hasNext()) {

-									EObject eObject = it.next();

-									if (eObject instanceof VirtualElement) {

-										if (((VirtualElement) eObject).getRepresentedElement() == null) {

-											org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_37 + eObject);

-										}

-									}

-								}

-

-								// Save

-								save();

-

-								if (diagnostic.getSeverity() == Diagnostic.OK) {

-									MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.EcoreGenerator_40, Messages.EcoreGenerator_41);

-

-								} else {

-									DiagnosticDialog dialog = new DiagnosticDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.EcoreGenerator_42, Messages.EcoreGenerator_43, diagnostic, Diagnostic.OK | Diagnostic.INFO

-											| Diagnostic.WARNING | Diagnostic.ERROR);

-									dialog.open();

-								}

-								monitor.done();

-							}

-						}

-					}

-				});

-			} catch (InvocationTargetException e) {

-				e.printStackTrace();

-			} catch (InterruptedException e) {

-				e.printStackTrace();

-			}

-

-		} else {

-			MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.EcoreGenerator_44, Messages.EcoreGenerator_45);

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java
deleted file mode 100644
index f12efad71fc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EOperation;

-import org.eclipse.emf.ecore.EParameter;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.ETypedElement;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.MultiplicityElement;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.TypedElement;

-

-public class MetamodelUtils {

-

-	/**

-	 * Check whether the list contains only {@link BaseMetaclass} that represent required extensions

-	 *

-	 * @param list

-	 * @return true if the list contains only required extensions

-	 */

-	public static boolean containsOnlyRequiredBaseMetaclass(List<BaseMetaclass> list) {

-		if (!list.isEmpty()) {

-			for (BaseMetaclass baseMetaclass : list) {

-				if (baseMetaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION || baseMetaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.GENERALIZATION) {

-					if (!baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

-						return false;

-					}

-				}

-			}

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * Check whether the list contains a {@link BaseMetaclass} that represent an abstract stereotype

-	 *

-	 * @param list

-	 * @return true if the list contains a {@link BaseMetaclass} that represent an abstract stereotype

-	 */

-	public static boolean containsAbstractStereotype(EList<BaseMetaclass> list) {

-		for (BaseMetaclass baseMetaclass : list) {

-			if (baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Extract only {@link VirtualMetaclass} from a list of {@link VirtualClassifier}

-	 *

-	 * @param list

-	 *            a list containing {@link VirtualClassifier}

-	 * @return

-	 *         a list containing only {@link VirtualMetaclass}

-	 */

-	public static List<VirtualMetaclass> getOnlyVirtualMetaclasses(Collection<VirtualClassifier> list) {

-		List<VirtualMetaclass> result = new ArrayList<VirtualMetaclass>();

-		for (VirtualClassifier classifier : list) {

-			if (classifier instanceof VirtualMetaclass) {

-				result.add((VirtualMetaclass) classifier);

-			}

-		}

-		return result;

-	}

-

-

-	/**

-	 * Check whether the list contains only {@link BaseMetaclass} that represent abstract stereotype

-	 *

-	 * @param list

-	 * @return

-	 *         true if the list contains only {@link BaseMetaclass} that represent abstract stereotype

-	 */

-	public static boolean containsOnlyAbstractStereotype(EList<BaseMetaclass> list) {

-		if (!list.isEmpty()) {

-			for (BaseMetaclass baseMetaclass : list) {

-				if (!baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

-					return false;

-				}

-			}

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * Find a {@link VirtualClassifier} that represents the element in the facade

-	 *

-	 * @param element

-	 *            the element that must be represented by the {@link VirtualClassifier}

-	 * @param facade

-	 * @return a {@link VirtualClassifier} that represents the element or null

-	 */

-	public static VirtualClassifier findClassifierThatMatch(EObject element, Facade facade) {

-

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-

-			if (classifier.getRepresentedElement() == element) {

-				if (classifier instanceof VirtualMetaclass) {

-

-					if (((VirtualMetaclass) classifier).getAppliedStereotypes().isEmpty() || onlyOneKind(((VirtualMetaclass) classifier).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

-						return (classifier);

-					}

-

-				} else {

-					return classifier;

-				}

-			}

-		}

-

-		// Try to find as an association

-		if (element instanceof Stereotype) {

-			for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-				if (classifier instanceof VirtualMetaclass) {

-					if (((VirtualMetaclass) classifier).getAppliedStereotypes().size() == 1) {

-						if (onlyOneKind(((VirtualMetaclass) classifier).getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

-							if (((VirtualMetaclass) classifier).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype() == element) {

-								return classifier;

-							}

-						}

-					}

-				}

-			}

-		}

-

-		if (element instanceof Classifier) {

-			EClassifier foundEClass = StereotypeUtils.findEClass((Classifier) element);

-			if (foundEClass != null) {

-				return findClassifierThatMatch(foundEClass, facade);

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Find a {@link VirtualClassifier} that represents the element in the facade but that doesn't have a stereotype applied

-	 *

-	 * @param element

-	 * @param facade

-	 * @return

-	 */

-	public static VirtualMetaclass findMetaclassWithNoRealStereoThatMatch(EObject element, Facade facade) {

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-

-			if (classifier instanceof VirtualMetaclass) {

-				if (((VirtualMetaclass) classifier).getRepresentedElement() == element) {

-					if (((VirtualMetaclass) classifier).getAppliedStereotypes().isEmpty() || onlyOneKind(((VirtualMetaclass) classifier).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

-

-						return ((VirtualMetaclass) classifier);

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Find a {@link VirtualProperty} that represents the feature in the facade

-	 *

-	 * @param feature

-	 * @param facade

-	 * @return

-	 */

-	public static VirtualProperty findProperty(EObject feature, Facade facade) {

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier instanceof VirtualMetaclass) {

-				for (VirtualProperty property : ((VirtualMetaclass) classifier).getProperties()) {

-					if (property.getRepresentedElement() == feature) {

-						return property;

-					}

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Find the BaseMetaclass that represents the actual base metaclass among the BaseMetaclasses of an ExtensionDefinition

-	 *

-	 * @param extensionDefinition

-	 * @return

-	 */

-	public static BaseMetaclass findActualBaseMetaclass(ExtensionDefinition extensionDefinition) {

-		for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-			if (baseMetaclass.getBase() == StereotypeUtils.findBase(extensionDefinition)) {

-				return baseMetaclass;

-

-			}

-		}

-		return null;

-

-	}

-

-	/**

-	 * Find a {@link VirtualMetaclass} that represents the element in the facade

-	 *

-	 * @param element

-	 * @param stereo

-	 * @param facade

-	 * @return

-	 */

-	public static VirtualMetaclass findMetaclassThatMatch(EObject element, Stereotype stereo, Facade facade) {

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier.getRepresentedElement() == element) {

-

-				if (classifier instanceof VirtualMetaclass) {

-					if (((VirtualMetaclass) classifier).getAppliedStereotypes().size() == 1) {

-

-						if (((VirtualMetaclass) classifier).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype() == stereo) {

-							return ((VirtualMetaclass) classifier);

-						}

-

-					}

-				}

-			}

-

-		}

-		return null;

-	}

-

-	/**

-	 * Check whether the stereotype represented by the {@link ExtensionDefinition} is a the same as the stereotype related to the extension

-	 * represented by this {@link ExtensionDefinition}

-	 *

-	 * @param extensionDefinition

-	 * @return

-	 */

-	public static boolean isActualExtensionDefinition(ExtensionDefinition extensionDefinition) {

-

-		if (extensionDefinition.getExtension().getStereotype() == extensionDefinition.getStereotype()) {

-			return true;

-		}

-

-		return false;

-

-	}

-

-	/**

-	 * Check whether the list of {@link BaseMetaclass} contains only {@link BaseMetaclass} that are of the same {@link ExtensionDefinitionKind}

-	 *

-	 * @param list

-	 * @param kind

-	 * @return

-	 */

-	public static boolean onlyOneKind(List<BaseMetaclass> list, ExtensionDefinitionKind kind) {

-		for (BaseMetaclass baseMetaclass : list) {

-			if (baseMetaclass.getExtensionDefinition().getKind() != kind) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * Check whether the stereotype represented by an {@link ExtensionDefinition} is also represented by another {@link ExtensionDefinition}

-	 *

-	 * @param extensionDefinition

-	 * @return

-	 */

-	public static boolean hasSiblings(ExtensionDefinition extensionDefinition) {

-		Facade facade = extensionDefinition.getFacade();

-

-		for (ExtensionDefinition otherExtensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition != otherExtensionDefinition) {

-				if (extensionDefinition.getStereotype() == otherExtensionDefinition.getStereotype()) {

-					return true;

-				}

-

-			}

-		}

-		return false;

-	}

-

-	public static ArrayList<VirtualMetaclass> findThoseToSpecialize(VirtualMetaclass metaclassInput, Facade facade) {

-		ArrayList<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

-		BaseMetaclass requiredBaseMetaclass = null;

-

-		// Find the required one

-		for (BaseMetaclass baseMetaclass : metaclassInput.getAppliedStereotypes()) {

-			if (baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

-				requiredBaseMetaclass = baseMetaclass;

-				break;

-			}

-		}

-

-		if (requiredBaseMetaclass != null) {

-			output.add(findMetaclassThatMatch(requiredBaseMetaclass.getBase(), requiredBaseMetaclass.getExtensionDefinition().getStereotype(), facade));

-		} else {

-			output.add(findMetaclassWithNoRealStereoThatMatch(metaclassInput.getRepresentedElement(), facade));

-		}

-

-		return output;

-

-	}

-

-	/**

-	 * Get all {@link VirtualMetaclass} (i.e. recursively) that are generals of a {@link VirtualMetaclass}

-	 *

-	 * @param metaclass

-	 * @return

-	 */

-	public static List<VirtualMetaclass> getAllFathers(VirtualMetaclass metaclass) {

-

-		List<VirtualMetaclass> toProcess = new ArrayList<VirtualMetaclass>();

-		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

-

-		toProcess.addAll(getFathers(metaclass));

-		while (!toProcess.isEmpty()) {

-			VirtualMetaclass father = toProcess.remove(0);

-			output.add(father);

-			toProcess.addAll(getFathers(father));

-		}

-

-		return output;

-

-	}

-

-	/**

-	 * Get {@link VirtualMetaclass} that are generals of a {@link VirtualMetaclass}

-	 *

-	 * @param metaclass

-	 * @return

-	 */

-	public static List<VirtualMetaclass> getFathers(VirtualMetaclass metaclass) {

-		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

-

-		Facade facade = metaclass.getMetamodel().getFacade();

-

-		if (metaclass.getAppliedStereotypes().isEmpty() || onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

-			if (metaclass.getRepresentedElement() instanceof EClass) {

-				EList<EClass> supers = ((EClass) metaclass.getRepresentedElement()).getESuperTypes();

-				for (EClass eClass : supers) {

-					VirtualMetaclass meta = findMetaclassWithNoRealStereoThatMatch(eClass, facade);

-					if (meta != null) {

-						output.add(meta);

-					}

-				}

-			}

-		} else if (onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION)) {

-			if (MetamodelUtils.containsOnlyRequiredBaseMetaclass(metaclass.getAppliedStereotypes())) {

-				if (metaclass.getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getGenerals().isEmpty()) {

-					output.add(findMetaclassWithNoRealStereoThatMatch(metaclass.getAppliedStereotypes().get(0).getBase(), facade));

-				} else {

-					EList<Classifier> supersStereo = metaclass.getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getGenerals();

-					for (Classifier superStereo : supersStereo) {

-						output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype) superStereo, facade));

-					}

-				}

-			} else {

-				// Get the one that we must extend

-				output.addAll(findThoseToSpecialize(metaclass, facade));

-			}

-

-			// Add the StereotypeInterface to generals

-			for (BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

-				output.add(findStereotypeInterface(stereotype));

-			}

-

-		} else if (onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

-			for (BaseMetaclass baseMetaclass : metaclass.getAppliedStereotypes()) {

-				EList<Classifier> supersStereo = baseMetaclass.getExtensionDefinition().getStereotype().getGenerals();

-				for (Classifier superStereo : supersStereo) {

-					output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype) superStereo, facade));

-				}

-			}

-

-			if (hasSiblings(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition())) {

-				// Add the StereotypeInterface to generals

-				for (BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

-					output.add(findStereotypeInterface(stereotype));

-				}

-			}

-		} else if (onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.GENERALIZATION)) {

-			for (BaseMetaclass baseMetaclass : metaclass.getAppliedStereotypes()) {

-				EList<Classifier> supersStereo = baseMetaclass.getExtensionDefinition().getStereotype().getGenerals();

-				if (!supersStereo.isEmpty()) {

-					for (Classifier superStereo : supersStereo) {

-						output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype) superStereo, facade));

-					}

-				} else {

-					output.add(findMetaclassWithNoRealStereoThatMatch(StereotypeUtils.findBase(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition()), facade));

-				}

-			}

-

-			if (hasSiblings(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition())) {

-				// Add the StereotypeInterface to generals

-				for (BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

-					output.add(findStereotypeInterface(stereotype));

-				}

-			}

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_0 + metaclass.getAliasName());

-		}

-

-		return output;

-	}

-

-	public static VirtualMetaclass findStereotypeInterface(BaseMetaclass stereotype) {

-		List<VirtualMetaclass> allVirtualMetaclasses = getOnlyVirtualMetaclasses(stereotype.getExtensionDefinition().getFacade().getVirtualmetamodel().getVirtualClassifiers());

-

-		for (VirtualMetaclass virtualMetaclass : allVirtualMetaclasses) {

-			if (virtualMetaclass.isStereotypeInterface()) {

-				if (virtualMetaclass.getRepresentedElement() == stereotype.getExtensionDefinition().getStereotype()) {

-					return virtualMetaclass;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get {@link VirtualMetaclass} that are children (through generalization relationship) of a {@link VirtualMetaclass}

-	 *

-	 * @param parent

-	 * @return

-	 */

-	public static List<VirtualMetaclass> getChildren(VirtualMetaclass parent) {

-		List<VirtualMetaclass> children = new ArrayList<VirtualMetaclass>();

-

-		for (VirtualClassifier classifier : parent.getMetamodel().getVirtualClassifiers()) {

-

-			if (classifier instanceof VirtualMetaclass) {

-				if (MetamodelUtils.getFathers((VirtualMetaclass) classifier).contains(parent)) {

-					children.add((VirtualMetaclass) classifier);

-				}

-			}

-		}

-

-		return children;

-	}

-

-	/**

-	 * Get all {@link VirtualMetaclass} (i.e. recursively) that are children (through generalization relationship) of a {@link VirtualMetaclass}

-	 *

-	 * @param parent

-	 * @return

-	 */

-	public static List<VirtualMetaclass> getAllChildren(VirtualMetaclass parent) {

-		List<VirtualMetaclass> toProcess = new ArrayList<VirtualMetaclass>();

-		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

-

-		toProcess.addAll(getChildren(parent));

-		while (!toProcess.isEmpty()) {

-			VirtualMetaclass child = toProcess.remove(0);

-			output.add(child);

-			toProcess.addAll(getChildren(child));

-		}

-

-		return output;

-	}

-

-	public static boolean mustBeAbstract(VirtualMetaclass metaclass) {

-		if (metaclass.isStereotypeInterface()) {

-			return true;

-		}

-		if (metaclass.getAppliedStereotypes().isEmpty()) {

-			if (metaclass.getRepresentedElement() instanceof EClass) {

-				if (((EClass) metaclass.getRepresentedElement()).isAbstract()) {

-					return true;

-				} else {

-

-					List<VirtualMetaclass> children = getChildren(metaclass);

-

-					if (containsOnlyRequired(children)) {

-						return true;

-					}

-				}

-			}

-		} else {

-			if (containsOnlyAbstractStereotype(metaclass.getAppliedStereotypes())) {

-				return true;

-			}

-		}

-

-		return false;

-

-	}

-

-	private static boolean containsOnlyRequired(List<VirtualMetaclass> children) {

-		if (!children.isEmpty()) {

-			for (VirtualMetaclass metaclass : children) {

-				if (!containsOnlyRequiredBaseMetaclass(metaclass.getAppliedStereotypes())) {

-					return false;

-				}

-			}

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	public static boolean canBeAbstract(VirtualMetaclass metaclass) {

-

-		if (!mustBeAbstract(metaclass)) {

-			for (VirtualMetaclass child : getAllChildren(metaclass)) {

-				if (child.isKept()) {

-					if (!child.isAbstract()) {

-						return true;

-					}

-				}

-			}

-		}

-		return false;

-

-	}

-

-	public static boolean isStereotypableByMetaclassKind(EClass classifier, Facade facade) {

-		for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-			if (extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-				for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-					if (baseMetaclass.isPossible() == true) {

-						if (baseMetaclass.getBase() == classifier) {

-							return true;

-						}

-					}

-				}

-			}

-		}

-		return false;

-	}

-

-	public static List<Stereotype> getStereotypesFromBaseMetaclass(List<BaseMetaclass> list) {

-		List<Stereotype> result = new ArrayList<Stereotype>();

-		for (BaseMetaclass baseMetaclass : list) {

-			if (!result.contains(baseMetaclass.getExtensionDefinition().getStereotype())) {

-				result.add(baseMetaclass.getExtensionDefinition().getStereotype());

-			}

-		}

-		return result;

-	}

-

-	public static VirtualClassifier addMetaclass(EObject representedElement, List<BaseMetaclass> stereotypes, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-

-		VirtualClassifier output = null;

-

-		// Verify that the virtualmetaclass doesn't exist already

-		boolean found = false;

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-

-			if (classifier.getRepresentedElement() == representedElement) {

-				if (stereotypes != null) {

-					List<Stereotype> classifierStereotypes = getStereotypesFromBaseMetaclass(((VirtualMetaclass) classifier).getAppliedStereotypes());

-					List<Stereotype> stereotypesToAdd = getStereotypesFromBaseMetaclass(stereotypes);

-					if (classifierStereotypes.size() == stereotypesToAdd.size()) {

-

-						if (classifierStereotypes.containsAll(stereotypesToAdd)) {

-							output = (classifier);

-							found = true;

-							break;

-						}

-					}

-				} else {

-					output = classifier;

-					found = true;

-					break;

-				}

-

-			}

-		}

-

-		if (!found) {

-			if (representedElement instanceof PrimitiveType) {

-				VirtualDatatype datatype = VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype();

-				datatype.setKept(true);

-				datatype.setRepresentedElement(representedElement);

-				datatype.setAliasName(alias);

-				AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), datatype);

-				editingDomain.getCommandStack().execute(command);

-

-				output = datatype;

-			} else {

-				VirtualMetaclass metaclass = VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass();

-				metaclass.setKept(true);

-				metaclass.setRepresentedElement(representedElement);

-				metaclass.setAbstract(false);

-				metaclass.setStereotypeInterface(false);

-				if (stereotypes != null) {

-					metaclass.getAppliedStereotypes().addAll(stereotypes);

-				}

-				metaclass.setAliasName(alias);

-				AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), metaclass);

-				editingDomain.getCommandStack().execute(command);

-

-				output = metaclass;

-			}

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_1 + representedElement);

-		}

-

-		return output;

-	}

-

-	public static VirtualEnum addEnum(EObject representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		VirtualEnum output = null;

-

-		boolean found = false;

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier instanceof VirtualEnum) {

-				if (classifier.getRepresentedElement() == representedElement) {

-					output = (VirtualEnum) classifier;

-					found = true;

-					break;

-				}

-			}

-		}

-

-		if (!found) {

-

-			VirtualEnum enumeration = VirtualmetamodelFactory.eINSTANCE.createVirtualEnum();

-			enumeration.setKept(true);

-			enumeration.setRepresentedElement(representedElement);

-			enumeration.setAliasName(alias);

-			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), enumeration);

-			editingDomain.getCommandStack().execute(command);

-

-			if (enumeration.getRepresentedElement() instanceof EEnum) {

-				EList<EEnumLiteral> literals = ((EEnum) enumeration.getRepresentedElement()).getELiterals();

-				for (EEnumLiteral literal : literals) {

-					MetamodelUtils.addLiteral(enumeration, literal, literal.getName(), facade, editingDomain);

-				}

-			} else if (enumeration.getRepresentedElement() instanceof Enumeration) {

-				EList<EnumerationLiteral> literals = ((Enumeration) enumeration.getRepresentedElement()).getOwnedLiterals();

-				for (EnumerationLiteral literal : literals) {

-					MetamodelUtils.addLiteral(enumeration, literal, literal.getName(), facade, editingDomain);

-				}

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_2 + enumeration.getRepresentedElement());

-			}

-

-			output = enumeration;

-		}

-

-		return output;

-	}

-

-	public static VirtualOperation addOperation(VirtualMetaclass metaclass, EObject operationElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		VirtualOperation output = null;

-

-		boolean found = false;

-		for (VirtualOperation operation : metaclass.getOperations()) {

-			if (operation.getRepresentedElement() == operationElement) {

-				output = operation;

-				found = true;

-				break;

-			}

-		}

-

-		if (!found) {

-			VirtualOperation operation = VirtualmetamodelFactory.eINSTANCE.createVirtualOperation();

-			operation.setKept(true);

-			operation.setRepresentedElement(operationElement);

-			operation.setAliasName(alias);

-			processMultiplicities(operationElement, operation);

-

-			processTypedElement(operationElement, facade, editingDomain);

-

-			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Operations(), operation);

-			editingDomain.getCommandStack().execute(command);

-

-			if (operation.getRepresentedElement() instanceof EOperation) {

-				EList<EParameter> parameters = ((EOperation) operation.getRepresentedElement()).getEParameters();

-				for (EParameter param : parameters) {

-					MetamodelUtils.addParameter(operation, param, param.getName(), facade, editingDomain);

-				}

-			} else if (operation.getRepresentedElement() instanceof Operation) {

-				EList<Parameter> parameters = ((Operation) operation.getRepresentedElement()).getOwnedParameters();

-				for (Parameter param : parameters) {

-					MetamodelUtils.addParameter(operation, param, param.getName(), facade, editingDomain);

-				}

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_3 + operation.getRepresentedElement());

-			}

-

-			output = operation;

-		}

-

-		return output;

-	}

-

-	public static VirtualDatatype addDatatype(EObject representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-

-		VirtualDatatype output = null;

-

-		boolean found = false;

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier instanceof VirtualDatatype) {

-				if (classifier.getRepresentedElement() == representedElement) {

-					output = (VirtualDatatype) classifier;

-					found = true;

-					break;

-				}

-			}

-		}

-

-		if (!found) {

-

-			VirtualDatatype datatype = VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype();

-			datatype.setKept(true);

-			datatype.setRepresentedElement(representedElement);

-			datatype.setAliasName(alias);

-			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), datatype);

-			editingDomain.getCommandStack().execute(command);

-

-			output = datatype;

-

-		}

-

-		return output;

-	}

-

-	public static VirtualMetaclass addStereotypeInterface(Stereotype representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-

-		VirtualMetaclass output = null;

-

-		boolean found = false;

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier instanceof VirtualMetaclass) {

-				if (((VirtualMetaclass) classifier).isStereotypeInterface()) {

-					if (classifier.getRepresentedElement() == representedElement) {

-						output = (VirtualMetaclass) classifier;

-						found = true;

-						break;

-					}

-				}

-			}

-		}

-

-		if (!found) {

-			VirtualMetaclass metaclass = VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass();

-			metaclass.setKept(true);

-			metaclass.setRepresentedElement(representedElement);

-			metaclass.setAliasName(alias);

-			metaclass.setAbstract(true);

-			metaclass.setStereotypeInterface(true);

-			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), metaclass);

-			editingDomain.getCommandStack().execute(command);

-

-			output = metaclass;

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_4 + representedElement);

-		}

-

-		return output;

-	}

-

-	public static VirtualClassifier createForType(EObject classifier, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		if (classifier instanceof EClass) {

-			VirtualClassifier metaclass = MetamodelUtils.addMetaclass(classifier, null, ((EClass) classifier).getName(), facade, editingDomain);

-			return metaclass;

-		} else if (classifier instanceof EDataType) {

-			if (classifier instanceof EEnum) {

-				VirtualEnum enumeration = MetamodelUtils.addEnum(classifier, ((EEnum) classifier).getName(), facade, editingDomain);

-				return enumeration;

-			} else {

-				VirtualDatatype datatype = MetamodelUtils.addDatatype(classifier, ((EDataType) classifier).getName(), facade, editingDomain);

-				return datatype;

-			}

-		} else if (classifier instanceof DataType) {

-			VirtualClassifier dataype = MetamodelUtils.addMetaclass(classifier, null, ((DataType) classifier).getName(), facade, editingDomain);

-			return dataype;

-		} else if (classifier instanceof PrimitiveType) {

-			// VirtualClassifier dataype = MetamodelUtils.addMetaclass(classifier, null, ((PrimitiveType)classifier).getName(), facade, editingDomain);

-			// return dataype;

-		}

-		return null;

-	}

-

-	public static void processMultiplicities(EObject element, VirtualTypedElement virtualElement) {

-		int lower = 0;

-		int upper = 0;

-

-		if (element instanceof ETypedElement) {

-			lower = ((ETypedElement) element).getLowerBound();

-			upper = ((ETypedElement) element).getUpperBound();

-		} else if (element instanceof MultiplicityElement) {

-

-			lower = ((MultiplicityElement) element).getLower();

-			upper = ((MultiplicityElement) element).getUpper();

-		}

-

-		virtualElement.setLower(lower);

-		virtualElement.setUpper(upper);

-	}

-

-	public static void processTypedElement(EObject typedElement, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		if (typedElement instanceof ETypedElement) {

-

-			EClassifier eType = ((ETypedElement) typedElement).getEType();

-

-			if (!containtsType(eType, facade)) {

-				VirtualClassifier newType = createForType(eType, facade, editingDomain);

-				if (newType instanceof VirtualMetaclass) {

-					createProperties((VirtualMetaclass) newType, facade, editingDomain);

-				}

-			}

-		} else if (typedElement instanceof TypedElement) {

-

-			if (!(((TypedElement) typedElement).getType() instanceof Stereotype)) {

-				if (((TypedElement) typedElement).getType() instanceof Enumeration) {

-					EObject eType = ((TypedElement) typedElement).getType();

-					String name = ((TypedElement) typedElement).getType().getName();

-					if (!containtsType(eType, facade)) {

-						MetamodelUtils.addEnum(eType, name, facade, editingDomain);

-					}

-				} else if (((TypedElement) typedElement).getType() instanceof DataType) {

-					if (((TypedElement) typedElement).getType() instanceof PrimitiveType) {

-						// Check if it is a UML primitivetype

-						EObject eType = StereotypeUtils.findEClass((Classifier) ((TypedElement) typedElement).getType());

-						if (eType != null) {

-							if (!containtsType(eType, facade)) {

-								VirtualClassifier virtualClassifier = createForType(eType, facade, editingDomain);

-								if (virtualClassifier instanceof VirtualMetaclass) {

-									createProperties((VirtualMetaclass) virtualClassifier, facade, editingDomain);

-								}

-							}

-						} else {

-							createForType(((TypedElement) typedElement).getType(), facade, editingDomain);

-						}

-					} else {

-

-						VirtualClassifier virtualClassifier = createForType(((TypedElement) typedElement).getType(), facade, editingDomain);

-						if (virtualClassifier instanceof VirtualMetaclass) {

-							createProperties((VirtualMetaclass) virtualClassifier, facade, editingDomain);

-						}

-

-					}

-				} else if (((TypedElement) typedElement).getType() instanceof org.eclipse.uml2.uml.Class) {

-					EClassifier eClass = StereotypeUtils.findEClass((Classifier) ((TypedElement) typedElement).getType());

-					if (eClass == null) {

-						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_5);

-					}

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_6 + ((TypedElement) typedElement).getType());

-				}

-			}

-

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_7 + typedElement);

-		}

-	}

-

-	public static void addProperty(VirtualMetaclass metaclass, EObject propertyElement, EObject type, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-

-		boolean found = false;

-		for (VirtualProperty property : metaclass.getProperties()) {

-			if (property.getRepresentedElement() == propertyElement) {

-				found = true;

-			}

-		}

-

-		if (!found) {

-

-			processTypedElement(propertyElement, facade, editingDomain);

-

-			VirtualProperty property = VirtualmetamodelFactory.eINSTANCE.createVirtualProperty();

-			property.setKept(true);

-			property.setAliasName(alias);

-			property.setRepresentedElement(propertyElement);

-			processMultiplicities(propertyElement, property);

-

-			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Properties(), property);

-			editingDomain.getCommandStack().execute(command);

-		} else {

-			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_8 + propertyElement);

-		}

-

-	}

-

-	public static VirtualParameter addParameter(VirtualOperation operation, EObject parameterElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		VirtualParameter virtualParameter = VirtualmetamodelFactory.eINSTANCE.createVirtualParameter();

-		virtualParameter.setKept(true);

-		virtualParameter.setAliasName(alias);

-		virtualParameter.setRepresentedElement(parameterElement);

-		processMultiplicities(parameterElement, virtualParameter);

-

-		processTypedElement(parameterElement, facade, editingDomain);

-

-		AddCommand command = new AddCommand(editingDomain, operation, VirtualmetamodelPackage.eINSTANCE.getVirtualOperation_Parameters(), virtualParameter);

-		editingDomain.getCommandStack().execute(command);

-

-		return virtualParameter;

-	}

-

-	public static VirtualLiteral addLiteral(VirtualEnum enumeration, EObject element, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		VirtualLiteral literal = VirtualmetamodelFactory.eINSTANCE.createVirtualLiteral();

-		literal.setKept(true);

-		literal.setAliasName(alias);

-		literal.setRepresentedElement(element);

-

-		AddCommand command = new AddCommand(editingDomain, enumeration, VirtualmetamodelPackage.eINSTANCE.getVirtualEnum_Literals(), literal);

-		editingDomain.getCommandStack().execute(command);

-

-		return literal;

-	}

-

-	public static void createStereotypeProperties(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		// Add stereotype properties only if it is not already added to a father

-

-		for (BaseMetaclass appliedStereotype : metaclass.getAppliedStereotypes()) {

-			List<VirtualMetaclass> allFathers = MetamodelUtils.getAllFathers(metaclass);

-

-			boolean alreadyApplied = false;

-			for (VirtualMetaclass virtualMetaclass : allFathers) {

-				if (virtualMetaclass.getAppliedStereotypes().contains(appliedStereotype)) {

-					alreadyApplied = true;

-				}

-			}

-

-			if (!alreadyApplied) {

-

-				if (!hasSiblings(appliedStereotype.getExtensionDefinition())) {

-

-					EList<Property> stereotypeProperties = appliedStereotype.getExtensionDefinition().getStereotype().getAttributes();

-					for (Property property : stereotypeProperties) {

-

-						if (appliedStereotype.getExtensionDefinition().getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-							if (!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

-								MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-							} else {

-								if (appliedStereotype.getExtensionDefinition().getExtension().getMemberEnds().contains(property)) {

-									MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-								}

-							}

-						} else {

-							if (!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

-								MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-							}

-						}

-					}

-

-				} else {

-					EList<Property> stereotypeProperties = appliedStereotype.getExtensionDefinition().getStereotype().getAttributes();

-					for (Property property : stereotypeProperties) {

-

-						if (appliedStereotype.getExtensionDefinition().getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-							if (property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

-								if (appliedStereotype.getExtensionDefinition().getExtension().getMemberEnds().contains(property)) {

-									MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-								}

-							}

-						}

-					}

-				}

-			} else {

-				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_9);

-			}

-		}

-	}

-

-	public static void createProperties(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		if (metaclass.isStereotypeInterface()) {

-			EList<Property> stereotypeProperties = ((Stereotype) metaclass.getRepresentedElement()).getAttributes();

-			for (Property property : stereotypeProperties) {

-				if (!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

-					MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-				}

-			}

-		} else {

-			if (!onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION) || metaclass.getAppliedStereotypes().isEmpty()) {

-				if (metaclass.getRepresentedElement() instanceof EClass) {

-					if (onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.FUSION) || metaclass.getAppliedStereotypes().isEmpty()) {

-						EList<EStructuralFeature> properties = ((EClass) metaclass.getRepresentedElement()).getEStructuralFeatures();

-						for (EStructuralFeature eStructuralFeature : properties) {

-							MetamodelUtils.addProperty(metaclass, eStructuralFeature, eStructuralFeature.getEType(), eStructuralFeature.getName(), facade, editingDomain);

-						}

-					}

-				} else if (metaclass.getRepresentedElement() instanceof DataType) {

-					EList<Property> properties = ((DataType) metaclass.getRepresentedElement()).getAttributes();

-					for (Property property : properties) {

-						MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

-					}

-				} else {

-					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_10 + metaclass.getRepresentedElement());

-				}

-

-				createStereotypeProperties(metaclass, facade, editingDomain);

-			}

-		}

-	}

-

-	public static void createPropertiesForAll(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		// Only VirtualMetaclasses can have properties

-		for (VirtualMetaclass metaclass : getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

-			createProperties(metaclass, facade, editingDomain);

-		}

-	}

-

-	protected static boolean containtsType(EObject type, Facade facade) {

-		for (VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

-			if (classifier.isKept()) {

-				if (classifier.getRepresentedElement() == type) {

-					return true;

-				}

-			}

-		}

-

-		return false;

-	}

-

-	public static List<VirtualClassifier> getElements(Facade inputElement) {

-

-		List<VirtualClassifier> elements = new ArrayList<VirtualClassifier>();

-		if (inputElement.getVirtualmetamodel() != null) {

-			for (VirtualClassifier classifier : inputElement.getVirtualmetamodel().getVirtualClassifiers()) {

-

-				if (classifier instanceof VirtualMetaclass) {

-					if (MetamodelUtils.getFathers((VirtualMetaclass) classifier).isEmpty()) {

-						elements.add(classifier);

-					}

-				} else {

-					elements.add(classifier);

-				}

-			}

-		}

-

-		return elements;

-	}

-

-	public static void createGeneralizations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		for (VirtualMetaclass metaclass : MetamodelUtils.getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

-			List<VirtualMetaclass> fathers = getFathers(metaclass);

-

-			List<VirtualMetaclass> fathersToAdd = new ArrayList<VirtualMetaclass>();

-			for (VirtualMetaclass father : fathers) {

-				if (!metaclass.getParents().contains(father)) {

-					fathersToAdd.add(father);

-				}

-			}

-

-			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Parents(), fathersToAdd);

-			editingDomain.getCommandStack().execute(command);

-		}

-	}

-

-	public static void createOperationsForAll(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		// Only VirtualMetaclasses can have operations

-		for (VirtualMetaclass metaclass : getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

-			createOperations(metaclass, facade, editingDomain);

-		}

-	}

-

-	private static void createOperations(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		if (metaclass.getRepresentedElement() instanceof EClass) {

-			if (metaclass.getAppliedStereotypes().isEmpty()) {

-				EList<EOperation> operations = ((EClass) metaclass.getRepresentedElement()).getEOperations();

-				for (EOperation eOperation : operations) {

-					addOperation(metaclass, eOperation, eOperation.getName(), facade, editingDomain);

-				}

-			}

-		}

-	}

-

-	public static void postProcessTypedElements(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		TreeIterator<EObject> it = facade.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-

-			if (eObject instanceof VirtualTypedElement) {

-				VirtualTypedElement virtualTypedElement = (VirtualTypedElement) eObject;

-				VirtualClassifier representingType = null;

-				if (virtualTypedElement.getRepresentedElement() instanceof TypedElement) {

-					representingType = MetamodelUtils.findClassifierThatMatch(((TypedElement) virtualTypedElement.getRepresentedElement()).getType(), facade);

-					if (representingType != null) {

-						virtualTypedElement.setType(representingType);

-					} else {

-						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_11 + virtualTypedElement);

-					}

-				} else {

-					if (virtualTypedElement.getRepresentedElement() instanceof ETypedElement) {

-						if (((ETypedElement) virtualTypedElement.getRepresentedElement()).getEType() != null) {

-							representingType = MetamodelUtils.findClassifierThatMatch(((ETypedElement) virtualTypedElement.getRepresentedElement()).getEType(), facade);

-							if (representingType != null) {

-								virtualTypedElement.setType(representingType);

-							} else {

-								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_12 + virtualTypedElement);

-							}

-						}

-					} else {

-						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_13 + virtualTypedElement);

-					}

-				}

-

-			}

-		}

-	}

-

-	public static void postProcessUseRepresented(Facade facade, AdapterFactoryEditingDomain editingDomain) {

-		TreeIterator<EObject> it = facade.eAllContents();

-		while (it.hasNext()) {

-			EObject virtualElement = it.next();

-

-			if (virtualElement instanceof VirtualElement) {

-				EObject represented = ((VirtualElement) virtualElement).getRepresentedElement();

-

-				TreeIterator<EObject> ecoreIt = EcorePackage.eINSTANCE.eAllContents();

-				while (ecoreIt.hasNext()) {

-					EObject ecoreEObject = ecoreIt.next();

-					if (ecoreEObject == represented) {

-						((VirtualElement) virtualElement).setUseRepresented(true);

-					}

-				}

-

-			}

-

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java
deleted file mode 100644
index 1f4f1cfb587..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-

-public class ExtensionDefintionContentProvider implements ITreeContentProvider {

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 */

-	@Override

-	public Object[] getElements(Object inputElement) {

-		HashSet<ExtensionDefinition> output = new HashSet<ExtensionDefinition>();

-

-		if (inputElement instanceof Facade) {

-			EList<ExtensionDefinition> extensionsDefinitions = ((Facade) inputElement).getExtensionDefinitions();

-			for (ExtensionDefinition extensionDefinition : extensionsDefinitions) {

-				output.add(extensionDefinition);

-			}

-		}

-

-		return output.toArray();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 *

-	 * @param parentElement

-	 * @return

-	 */

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		List<BaseMetaclass> output = new ArrayList<BaseMetaclass>();

-		if (parentElement instanceof ExtensionDefinition) {

-

-			ExtensionDefinition parent = (ExtensionDefinition) parentElement;

-

-			if (parent.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-				for (BaseMetaclass baseMetaclass : parent.getBaseMetaclasses()) {

-					if (!((EClass) baseMetaclass.getBase()).isAbstract()) {

-						output.add(baseMetaclass);

-					}

-				}

-			}

-		}

-		return output.toArray();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean hasChildren(Object element) {

-		if (getChildren(element).length != 0) {

-			return true;

-		} else {

-			return false;

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java
deleted file mode 100644
index ce803ded96f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.viewers.IFontProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.Image;

-

-import com.swtdesigner.ResourceManager;

-

-public class ExtensionDefintionLabelProvider implements ITableLabelProvider, ILabelProvider, IFontProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public Image getColumnImage(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-

-			break;

-		case 1:

-			if (element instanceof ExtensionDefinition) {

-				if (((ExtensionDefinition) element).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

-					if (((ExtensionDefinition) element).getExtension().isRequired()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/associationRequired.png"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/association.png"); //$NON-NLS-1$

-					}

-				} else if (((ExtensionDefinition) element).getKind() == ExtensionDefinitionKind.GENERALIZATION) {

-					if (((ExtensionDefinition) element).getExtension().isRequired()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/generalizationRequired.png"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/generalization.png"); //$NON-NLS-1$

-					}

-

-				} else if (((ExtensionDefinition) element).getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-					if (((ExtensionDefinition) element).getExtension().isRequired()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/multigeneralizationRequired.png"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/multigeneralization.png"); //$NON-NLS-1$

-					}

-

-				} else if (((ExtensionDefinition) element).getKind() == ExtensionDefinitionKind.FUSION) {

-					if (((ExtensionDefinition) element).getExtension().isRequired()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/fusionRequired.png"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/fusion.png"); //$NON-NLS-1$

-					}

-

-				}

-

-			}

-			break;

-		case 2:

-			if (element instanceof BaseMetaclass) {

-				if (!((BaseMetaclass) element).getExtensionDefinition().getExtension().isRequired()) {

-					if (((BaseMetaclass) element).isPossible()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-					}

-				}

-

-			}

-			break;

-

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public String getColumnText(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			if (element instanceof ExtensionDefinition) {

-

-				String name = ((ExtensionDefinition) element).getStereotype().getQualifiedName();

-				if (!((ExtensionDefinition) element).getStereotype().getGenerals().isEmpty()) {

-					name += " [-> "; //$NON-NLS-1$

-					name += ((ExtensionDefinition) element).getStereotype().getGenerals().get(0).getQualifiedName();

-					if (((ExtensionDefinition) element).getStereotype().getGenerals().size() > 1) {

-						for (int i = 1; i < ((ExtensionDefinition) element).getStereotype().getGenerals().size(); i++) {

-							name += ", " + ((ExtensionDefinition) element).getStereotype().getGenerals().get(i).getQualifiedName(); //$NON-NLS-1$

-						}

-					}

-					name += "]"; //$NON-NLS-1$

-				}

-				name += Messages.ExtensionDefintionLabelProvider_13;

-				if (((ExtensionDefinition) element).getKind() != ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-					if (StereotypeUtils.findBase((ExtensionDefinition) element) != null) {

-						name += " " + StereotypeUtils.findBase((ExtensionDefinition) element).getName(); //$NON-NLS-1$

-					}

-				}

-				return name;

-

-			} else if (element instanceof BaseMetaclass) {

-				if (((BaseMetaclass) element).getBase() instanceof EClass) {

-

-					String name = ((EClass) ((BaseMetaclass) element).getBase()).getName();

-					return name;

-				}

-			}

-

-			break;

-		case 1:

-			if (element instanceof ExtensionDefinition) {

-				return ((ExtensionDefinition) element).getKind().getName();

-			}

-			break;

-		case 2:

-

-			break;

-

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Image getImage(Object element) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public String getText(Object element) {

-		return getColumnText(element, 0);

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Font getFont(Object element) {

-		if (element instanceof ExtensionDefinition) {

-			if (((ExtensionDefinition) element).getStereotype().isAbstract()) {

-				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

-			}

-		}

-		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java
deleted file mode 100644
index 481200813fb..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import java.util.HashSet;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-

-public class IncompatibilitiesContentProvider implements IStructuredContentProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 */

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-

-		HashSet<Combination> output = new HashSet<Combination>();

-		if (inputElement instanceof BaseMetaclass) {

-			output.addAll(((BaseMetaclass) inputElement).getIncompatibleStereotypes());

-			output.addAll(((BaseMetaclass) inputElement).getCompatibleStereotypes());

-		}

-		return output.toArray();

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java
deleted file mode 100644
index 104aaa790a0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.viewers.IFontProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

-import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Stereotype;

-

-import com.swtdesigner.ResourceManager;

-

-public class IncompatibilitiesLabelProvider implements ITableLabelProvider, IFontProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public Image getColumnImage(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			if (element instanceof Combination) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/combinaison.png"); //$NON-NLS-1$

-			}

-			break;

-		case 1:

-			if (element instanceof Combination) {

-				ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

-				if (selection instanceof IStructuredSelection) {

-					Object first = ((IStructuredSelection) selection).getFirstElement();

-

-					if (first instanceof BaseMetaclass) {

-						EList<Combination> incompatibleStereotypes = ((BaseMetaclass) first).getIncompatibleStereotypes();

-						if (incompatibleStereotypes.contains(element)) {

-							return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-						} else {

-							return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-						}

-					}

-				}

-

-			}

-			break;

-

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * Produce sibling list.

-	 *

-	 * @param stereotype

-	 *            the stereotype

-	 * @return the string

-	 */

-	protected String produceSiblingList(Stereotype stereotype) {

-		String output = ""; //$NON-NLS-1$

-		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(stereotype);

-		List<Classifier> siblingsList = new ArrayList<Classifier>(siblings);

-		if (siblingsList.size() > 1) {

-			output += "["; //$NON-NLS-1$

-		}

-

-		if (!siblingsList.isEmpty()) {

-			output += siblingsList.get(0).getQualifiedName();

-

-			if (siblingsList.size() > 1) {

-				for (int i = 1; i < siblingsList.size(); i++) {

-					output += ", "; //$NON-NLS-1$

-					output += siblingsList.get(i).getQualifiedName();

-				}

-			}

-		}

-

-		if (siblings.size() > 1) {

-			output += "]"; //$NON-NLS-1$

-		}

-		return output;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public String getColumnText(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			String name = ""; //$NON-NLS-1$

-			if (element instanceof Combination) {

-

-				Combination combination = (Combination) element;

-				if (!combination.getMembers().isEmpty()) {

-					name += combination.getMembers().get(0).getExtensionDefinition().getStereotype().getName();

-					if (((Combination) element).getMembers().size() > 1) {

-						for (int i = 1; i < combination.getMembers().size(); i++) {

-							name += ", "; //$NON-NLS-1$

-							name += combination.getMembers().get(i).getExtensionDefinition().getStereotype().getName();

-						}

-					}

-

-					return name;

-				}

-

-			}

-

-			break;

-		case 1:

-			break;

-

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Font getFont(Object element) {

-		if (element instanceof ExtensionDefinition) {

-			if (((ExtensionDefinition) element).getStereotype().isAbstract()) {

-				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

-			}

-		}

-

-		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java
deleted file mode 100644
index e6fc39dd02a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

-

-

-public class MetamodelContentProvider implements ITreeContentProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 */

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		List<VirtualElement> elements = new ArrayList<VirtualElement>();

-

-		if (inputElement instanceof Facade) {

-			elements.addAll(MetamodelUtils.getElements((Facade) inputElement));

-		}

-

-		return elements.toArray();

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 *

-	 * @param parentElement

-	 * @return

-	 */

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		List<VirtualMetaclass> children = new ArrayList<VirtualMetaclass>();

-

-		if (parentElement instanceof VirtualMetaclass) {

-			for (VirtualClassifier classifier : ((VirtualMetaclass) parentElement).getMetamodel().getVirtualClassifiers()) {

-

-				if (classifier instanceof VirtualMetaclass) {

-					if (((VirtualMetaclass) classifier).getParents().contains(parentElement)) {

-						children.add((VirtualMetaclass) classifier);

-					}

-				}

-			}

-		}

-

-		return children.toArray();

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public boolean hasChildren(Object element) {

-		if (getChildren(element).length == 0) {

-			return false;

-		} else {

-			return true;

-		}

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java
deleted file mode 100644
index 0c89f32380f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.viewers.IColorProvider;

-import org.eclipse.jface.viewers.IFontProvider;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

-import org.eclipse.papyrus.facadeSpecificEditor.Messages;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Font;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.NamedElement;

-

-import com.swtdesigner.ResourceManager;

-

-// TODO: Auto-generated Javadoc

-/**

- * The Class MetamodelLabelProvider.

- */

-public class MetamodelLabelProvider implements ITableLabelProvider, ILabelProvider, IFontProvider, IColorProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public Image getColumnImage(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			if (element instanceof VirtualMetaclass) {

-				if (((VirtualMetaclass) element).isStereotypeInterface()) {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/StereotypeInterface.gif"); //$NON-NLS-1$

-				} else {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualMetaclass.gif"); //$NON-NLS-1$

-				}

-			} else if (element instanceof VirtualDatatype) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualDatatype.gif"); //$NON-NLS-1$

-			} else if (element instanceof VirtualEnum) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualEnum.gif"); //$NON-NLS-1$

-			}

-

-			break;

-		case 1:

-			if (element instanceof VirtualElement) {

-				if (((VirtualElement) element).isKept()) {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-				} else {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-				}

-			}

-			break;

-		case 2:

-

-			break;

-

-		case 3:

-			if (element instanceof VirtualMetaclass) {

-				if (MetamodelUtils.canBeAbstract((VirtualMetaclass) element)) {

-					if (((VirtualMetaclass) element).isAbstract()) {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-					} else {

-						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-					}

-				}

-			}

-			break;

-

-		case 4:

-			if (element instanceof VirtualElement) {

-

-				if (((VirtualElement) element).isUseRepresented()) {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-				} else {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-				}

-

-			}

-			break;

-

-		default:

-			break;

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public String getColumnText(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			String result = Messages.MetamodelLabelProvider_8;

-			if (element instanceof VirtualElement) {

-				if (((VirtualElement) element).getRepresentedElement() instanceof ENamedElement) {

-					result = ((ENamedElement) ((VirtualElement) element).getRepresentedElement()).getName();

-				} else if (((VirtualElement) element).getRepresentedElement() instanceof NamedElement) {

-					result = ((NamedElement) ((VirtualElement) element).getRepresentedElement()).getName();

-				}

-

-				if (element instanceof VirtualMetaclass) {

-					if (!((VirtualMetaclass) element).getAppliedStereotypes().isEmpty()) {

-						result += " ("; //$NON-NLS-1$

-						result += ((VirtualMetaclass) element).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getName();

-

-						if (((VirtualMetaclass) element).getAppliedStereotypes().size() > 1) {

-							for (int i = 1; i < ((VirtualMetaclass) element).getAppliedStereotypes().size(); i++) {

-								result += ", "; //$NON-NLS-1$

-								result += ((VirtualMetaclass) element).getAppliedStereotypes().get(i).getExtensionDefinition().getStereotype().getName();

-							}

-

-						}

-						result += ")"; //$NON-NLS-1$

-					}

-				}

-			}

-

-			return result;

-

-		case 1:

-			break;

-

-		case 2:

-			if (element instanceof VirtualElement) {

-				return ((VirtualElement) element).getAliasName();

-			}

-			break;

-

-		case 3:

-			break;

-

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Image getImage(Object element) {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public String getText(Object element) {

-		return getColumnText(element, 0) + getColumnText(element, 2);

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Font getFont(Object element) {

-		if (element instanceof VirtualMetaclass) {

-

-			if (((VirtualMetaclass) element).isAbstract()) {

-				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

-			}

-		}

-

-		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Color getForeground(Object element) {

-		if (element instanceof VirtualElement) {

-			if (!((VirtualElement) element).isKept()) {

-				return Display.getDefault().getSystemColor(SWT.COLOR_GRAY);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)

-	 *

-	 * @param element

-	 * @return

-	 */

-

-	@Override

-	public Color getBackground(Object element) {

-

-		return null;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java
deleted file mode 100644
index a27ed2bcfd3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-

-public class TypedElementContentProvider implements ITreeContentProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 *

-	 */

-

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 *

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-	 *

-	 * @param inputElement

-	 * @return

-	 */

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		ArrayList<VirtualElement> output = new ArrayList<VirtualElement>();

-		if (inputElement instanceof VirtualMetaclass) {

-			output.addAll(((VirtualMetaclass) inputElement).getProperties());

-			output.addAll(((VirtualMetaclass) inputElement).getOperations());

-		}

-		if (inputElement instanceof VirtualEnum) {

-			output.addAll(((VirtualEnum) inputElement).getLiterals());

-		}

-

-		return output.toArray();

-	}

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		List<Object> result = new ArrayList<Object>();

-		if (parentElement instanceof VirtualOperation) {

-			result.addAll(((VirtualOperation) parentElement).getParameters());

-		}

-

-		return result.toArray();

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		if (getChildren(element).length == 0) {

-			return false;

-		} else {

-			return true;

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java
deleted file mode 100644
index a412acd4f93..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.providers;

-

-import org.eclipse.emf.ecore.ENamedElement;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.uml2.uml.NamedElement;

-

-import com.swtdesigner.ResourceManager;

-

-public class TypedElementLabelProvider implements ITableLabelProvider {

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-	 *

-	 * @param element

-	 * @param property

-	 * @return

-	 */

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-	 *

-	 * @param listener

-	 */

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public Image getColumnImage(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			if (element instanceof VirtualProperty) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualReference.gif"); //$NON-NLS-1$

-

-			} else if (element instanceof VirtualOperation) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualOperation.gif"); //$NON-NLS-1$

-

-			} else if (element instanceof VirtualLiteral) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualLiteral.gif"); //$NON-NLS-1$

-

-			} else if (element instanceof VirtualParameter) {

-				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualParameter.gif"); //$NON-NLS-1$

-

-			}

-			break;

-		case 1:

-			if (element instanceof VirtualElement) {

-				if (((VirtualElement) element).isKept()) {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

-				} else {

-					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

-				}

-			}

-			break;

-		case 2:

-

-			break;

-		case 3:

-

-			break;

-		case 4:

-

-			break;

-		default:

-			break;

-		}

-

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-	 *

-	 * @param element

-	 * @param columnIndex

-	 * @return

-	 */

-

-	@Override

-	public String getColumnText(Object element, int columnIndex) {

-		switch (columnIndex) {

-		case 0:

-			if (element instanceof VirtualElement) {

-

-				String name = ""; //$NON-NLS-1$

-				if (((VirtualElement) element).getRepresentedElement() instanceof ENamedElement) {

-					name += ((ENamedElement) ((VirtualElement) element).getRepresentedElement()).getName();

-				} else if (((VirtualElement) element).getRepresentedElement() instanceof NamedElement) {

-					name += ((NamedElement) ((VirtualElement) element).getRepresentedElement()).getName();

-				}

-

-				if (element instanceof VirtualTypedElement) {

-					if (((VirtualTypedElement) element).getType() != null) {

-						name += " (" + ((VirtualTypedElement) element).getType().getAliasName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

-					}

-				}

-

-				return name;

-			}

-			break;

-		case 1:

-

-			break;

-		case 2:

-			if (element instanceof VirtualElement) {

-				return ((VirtualElement) element).getAliasName();

-			}

-			break;

-		case 3:

-			if (element instanceof VirtualTypedElement) {

-				return ((VirtualTypedElement) element).getLower() + ""; //$NON-NLS-1$

-			}

-			break;

-		case 4:

-			if (element instanceof VirtualTypedElement) {

-				return ((VirtualTypedElement) element).getUpper() + ""; //$NON-NLS-1$

-			}

-			break;

-		default:

-			break;

-		}

-

-		return null;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java
deleted file mode 100644
index 1f57f6747cb..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.utils;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Vector;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.utils.CombinationGenerator;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-public class ProfileUtils {

-

-	public static HashSet<Classifier> getAllClassifiers(Classifier element) {

-

-		HashSet<Classifier> output = new HashSet<Classifier>();

-

-		// Fake go through

-		EcoreUtil.resolveAll(element);

-

-		EList<Resource> resources = element.eResource().getResourceSet().getResources();

-		for (Resource resource : resources) {

-			TreeIterator<EObject> it = resource.getAllContents();

-			while (it.hasNext()) {

-				EObject eObject = it.next();

-				if (eObject instanceof Classifier) {

-					output.add((Classifier) eObject);

-				}

-			}

-		}

-

-		return output;

-	}

-

-	public static HashSet<Extension> getAllExtensions(Profile profile) {

-

-		HashSet<Extension> output = new HashSet<Extension>();

-

-		// Fake go through

-		EcoreUtil.resolveAll(profile);

-

-		EList<Resource> resources = profile.eResource().getResourceSet().getResources();

-		for (Resource resource : resources) {

-			TreeIterator<EObject> it = resource.getAllContents();

-			while (it.hasNext()) {

-				EObject eObject = it.next();

-				if (eObject instanceof Extension) {

-					output.add((Extension) eObject);

-				}

-			}

-		}

-

-		return output;

-	}

-

-	public static List<Extension> findExtensions(Stereotype stereotype) {

-		List<Extension> extensions = new ArrayList<Extension>();

-

-		for (Property property : stereotype.getAllAttributes()) {

-			if (property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

-				if (property.getAssociation() instanceof Extension) {

-					extensions.add((Extension) property.getAssociation());

-				}

-			}

-		}

-

-		return extensions;

-

-	}

-

-	public static List<Stereotype> findAllSubsInProfile(Stereotype classifier) {

-		List<Stereotype> output = new ArrayList<Stereotype>();

-

-		HashSet<Classifier> classifiers = getAllClassifiers(classifier);

-		for (Classifier classifierCandidate : classifiers) {

-			if (classifierCandidate.getGenerals().contains(classifier)) {

-				if (classifierCandidate instanceof Stereotype) {

-					output.add((Stereotype) classifierCandidate);

-				}

-			}

-

-		}

-

-		return output;

-	}

-

-	protected static HashMap<Stereotype, HashSet<Stereotype>> siblingsReference = new HashMap<Stereotype, HashSet<Stereotype>>();

-

-	public static void initSiblings(Stereotype stereotype) {

-		siblingsReference.remove(stereotype);

-		siblingsReference.put(stereotype, findSibling(stereotype));

-	}

-

-	public static void clearSiblings() {

-		siblingsReference.clear();

-	}

-

-	public static HashSet<Stereotype> getSiblings(Stereotype stereotype) {

-		return siblingsReference.get(stereotype);

-	}

-

-	protected static HashSet<Stereotype> findSibling(Stereotype stereotype) {

-		HashSet<Stereotype> stereotypeRelatives = new HashSet<Stereotype>();

-

-		EList<Classifier> stereotypeGenerals = stereotype.getGenerals();

-

-		if (!stereotypeGenerals.isEmpty()) {

-			for (Classifier classifier : stereotypeGenerals) {

-				if (classifier instanceof Stereotype) {

-					stereotypeRelatives.addAll(findAllSubsInProfile((Stereotype) classifier));

-

-					stereotypeRelatives.add((Stereotype) classifier);

-				}

-			}

-		} else {

-			stereotypeRelatives.addAll(findAllSubsInProfile(stereotype));

-			stereotypeRelatives.add(stereotype);

-		}

-

-		return stereotypeRelatives;

-	}

-

-	public static boolean areNotRelatives(Stereotype stereotypeA, Stereotype stereotypeB) {

-

-		HashSet<Stereotype> stereotypeARelatives = getSiblings(stereotypeA);

-		HashSet<Stereotype> stereotypeBRelatives = getSiblings(stereotypeB);

-

-		// They must not be relatives

-		if (!stereotypeARelatives.contains(stereotypeB) && !stereotypeBRelatives.contains(stereotypeA)) {

-			return true;

-		}

-

-		return false;

-	}

-

-	protected static List<Combination> generatePossibleCombination(List<BaseMetaclass> possibleStereotypes) {

-		Vector<BaseMetaclass> elements = new Vector<BaseMetaclass>(possibleStereotypes);

-		int[] indices;

-

-		List<Combination> allCombination = new ArrayList<Combination>();

-		for (int k = 1; k <= possibleStereotypes.size(); k++) {

-			CombinationGenerator combinaisonGenerator = new CombinationGenerator(elements.size(), k);

-

-			while (combinaisonGenerator.hasMore()) {

-				// ArrayList<Stereotype> combination = new ArrayList<Stereotype>();

-				indices = combinaisonGenerator.getNext();

-

-				Combination combinaison = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-

-				for (int i = 0; i < indices.length; i++) {

-					// combination.add();

-					combinaison.getMembers().add(elements.get(indices[i]));

-				}

-

-				// Check that combination doesn't contain siblings

-				boolean containsSiblings = false;

-				for (BaseMetaclass baseA : combinaison.getMembers()) {

-					for (BaseMetaclass baseB : combinaison.getMembers()) {

-						if (baseA != baseB) {

-							if (!areNotRelatives(baseA.getExtensionDefinition().getStereotype(), baseB.getExtensionDefinition().getStereotype())) {

-								containsSiblings = true;

-							}

-						}

-					}

-				}

-

-				if (!containsSiblings) {

-					allCombination.add(combinaison);

-				}

-			}

-		}

-

-		return allCombination;

-	}

-

-	public static List<Combination> getPossibleCombinations(BaseMetaclass inputElement) {

-		List<BaseMetaclass> requiredCompatibleStereotypes = new ArrayList<BaseMetaclass>();

-		List<BaseMetaclass> optionalCompatibleStereotypes = new ArrayList<BaseMetaclass>();

-

-		if (inputElement.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-

-			Facade facade = inputElement.getExtensionDefinition().getFacade();

-			for (ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

-

-				if (extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

-					for (BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

-						if (baseMetaclass.getBase() == inputElement.getBase()) {

-

-							if (baseMetaclass != inputElement) {

-								Stereotype inputElementStereo = inputElement.getExtensionDefinition().getStereotype();

-								Stereotype baseMetaClassStereo = baseMetaclass.getExtensionDefinition().getStereotype();

-

-								if (ProfileUtils.areNotRelatives(inputElementStereo, baseMetaClassStereo)) {

-

-									if (!baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

-

-										if (baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

-											requiredCompatibleStereotypes.add(baseMetaclass);

-										} else {

-											optionalCompatibleStereotypes.add(baseMetaclass);

-										}

-

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-

-		List<Combination> possibleCombination = generatePossibleCombination(optionalCompatibleStereotypes);

-		if (!requiredCompatibleStereotypes.isEmpty()) {

-			for (Combination combination : possibleCombination) {

-				combination.getMembers().addAll(requiredCompatibleStereotypes);

-			}

-			Combination combinationRequired = ExtensiondefinitionFactory.eINSTANCE.createCombination();

-			combinationRequired.getMembers().addAll(requiredCompatibleStereotypes);

-			possibleCombination.add(combinationRequired);

-		}

-

-		return possibleCombination;

-

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java
deleted file mode 100644
index 4476fbe43e6..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.utils;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

-import org.eclipse.swt.widgets.Display;

-

-public class PrunerUtils {

-

-	// protected static VirtualElement findVirtualElement(EObject element, VirtualMetamodel metamodel) {

-	// TreeIterator<EObject> it = metamodel.eAllContents();

-	//

-	// while(it.hasNext()) {

-	// EObject eObject = (EObject)it.next();

-	// if(eObject instanceof VirtualElement) {

-	// if(((VirtualElement)eObject).getRepresentedElement() == element) {

-	// return (VirtualElement)eObject;

-	// }

-	// }

-	// }

-	// return null;

-	// }

-

-	// protected static boolean isUsed(VirtualClassifier classifier, VirtualMetamodel metamodel) {

-	//

-	// TreeIterator<EObject> it = metamodel.eAllContents();

-	//

-	// while(it.hasNext()) {

-	// EObject element = (EObject)it.next();

-	// if(element != classifier) {

-	// //VirtualMetclass of type of the property must be not kept

-	// if(element instanceof VirtualProperty) {

-	// if(((VirtualProperty)element).isKept()) {

-	//

-	// if(((VirtualProperty)element).getRepresentedElement() instanceof Property) {

-	// Type typeOfTheProperty = ((Property)((VirtualProperty)element).getRepresentedElement()).getType();

-	//

-	// if(findVirtualElement(typeOfTheProperty, metamodel).isKept()) {

-	//

-	// }

-	//

-	// } else if(((VirtualProperty)element).getRepresentedElement() instanceof EStructuralFeature) {

-	// EClassifier typeOfTheProperty = ((EStructuralFeature)((VirtualProperty)element).getRepresentedElement()).getEType();

-	// } else {

-	// org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info("The kind of the property is unknown: " + element);

-	// }

-	// }

-	//

-	// }

-	//

-	// }

-	//

-	// }

-	//

-	// return true;

-	// }

-

-	public static boolean classifierUnkeep(VirtualElement element, VirtualMetamodel metamodel, EditingDomain editingDomain) {

-		List<EObject> typedElementToUnkeep = new ArrayList<EObject>();

-

-		if (element instanceof VirtualClassifier) {

-			List<VirtualMetaclass> children = MetamodelUtils.getChildren((VirtualMetaclass) element);

-

-			for (VirtualMetaclass child : children) {

-				if (classifierUnkeep(child, metamodel, editingDomain) == false) {

-					return false;

-				}

-			}

-

-			TreeIterator<EObject> it = metamodel.eAllContents();

-

-			while (it.hasNext()) {

-				EObject metamodelElement = it.next();

-				if (metamodelElement != element) {

-					// VirtualMetclass of type of the property must be not kept

-					if (metamodelElement instanceof VirtualTypedElement) {

-						if (((VirtualTypedElement) metamodelElement).isKept()) {

-

-							if (((VirtualTypedElement) metamodelElement).getType() == element) {

-								if (((VirtualTypedElement) metamodelElement).getLower() > 0) {

-									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), "Cannot unkeep this element", "This element cannot be unkept because it is used by : " + ((VirtualTypedElement) metamodelElement).getAliasName());

-									return false;

-								}

-

-								typedElementToUnkeep.add(metamodelElement);

-							}

-						}

-					}

-				}

-			}

-		}

-

-		for (EObject eObject : typedElementToUnkeep) {

-			SetCommand command = new SetCommand(editingDomain, eObject, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), false);

-			editingDomain.getCommandStack().execute(command);

-		}

-

-		SetCommand command = new SetCommand(editingDomain, element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), false);

-		editingDomain.getCommandStack().execute(command);

-

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java
deleted file mode 100644
index 3d52a294303..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.utils;

-

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.ExtensionEnd;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-

-public class StereotypeUtils {

-

-	protected static EPackage umlMetamodel = UMLPackage.eINSTANCE;

-

-	protected static EPackage typesPackage = TypesPackage.eINSTANCE;

-

-	/**

-	 * Compute all the ecore UML metaclasses on which the stereotype can be applied

-	 *

-	 * @param stereotype

-	 * @param concreteClassesOnly

-	 * @return

-	 */

-	public static List<EClass> getAllExtendableMetaclasses(Stereotype stereotype, boolean concreteClassesOnly) {

-		EList<Class> extendedMetaclasses = stereotype.getAllExtendedMetaclasses();

-		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

-		for (Class extendedMetaclass : extendedMetaclasses) {

-			EClassifier UMLEClass = findEClass(extendedMetaclass);

-			if (UMLEClass instanceof EClass) {

-				allMetaclasses.addAll(getSubclassesOf((EClass) UMLEClass, concreteClassesOnly));

-			}

-		}

-

-		return new LinkedList<EClass>(allMetaclasses);

-	}

-

-	/**

-	 * Get the ecore UML metaclass corresponding to an {@link ExtensionDefinition}

-	 *

-	 * @param extension

-	 * @return

-	 */

-	public static EClassifier findBase(ExtensionDefinition extension) {

-		for (Property member : extension.getExtension().getMemberEnds()) {

-			if (!(member instanceof ExtensionEnd)) {

-				return findEClass((Classifier) member.getType());

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Compute all the ecore UML metaclasses on which the extension applies

-	 *

-	 * @param extension

-	 * @param concreteClassesOnly

-	 * @return

-	 */

-	public static List<EClass> getAllExtendableMetaclasses(Extension extension, boolean concreteClassesOnly) {

-		Class extendedMetaclass = extension.getMetaclass();

-		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

-

-		EClassifier UMLEClass = findEClass(extendedMetaclass);

-		if (UMLEClass instanceof EClass) {

-			allMetaclasses.addAll(getSubclassesOf((EClass) UMLEClass, concreteClassesOnly));

-		}

-

-		return new LinkedList<EClass>(allMetaclasses);

-	}

-

-	/**

-	 * Get all the ecore subclasses of a UML metaclass

-	 *

-	 * @param UMLEClass

-	 * @param concreteClassesOnly

-	 * @return

-	 */

-	protected static Collection<? extends EClass> getSubclassesOf(EClass UMLEClass, boolean concreteClassesOnly) {

-		Set<EClass> subs = new LinkedHashSet<EClass>();

-

-		if (UMLEClass != null) {

-			if ((concreteClassesOnly && !UMLEClass.isAbstract()) || !concreteClassesOnly) {

-				subs.add(UMLEClass);

-			}

-

-			for (EClassifier classifier : umlMetamodel.getEClassifiers()) {

-				if (classifier instanceof EClass) {

-					EClass clazz = (EClass) classifier;

-

-					if ((concreteClassesOnly && !clazz.isAbstract()) || !concreteClassesOnly) {

-

-						EList<EClass> supers = clazz.getEAllSuperTypes();

-						if (supers.contains(UMLEClass)) {

-							subs.add(clazz);

-						}

-					}

-				}

-			}

-		}

-		return subs;

-	}

-

-	/**

-	 * Get the eClass in the UML metamodel from a UML classifier

-	 *

-	 * @param type

-	 * @return

-	 */

-	public static EClassifier findEClass(Classifier type) {

-		for (EClassifier classifier : umlMetamodel.getEClassifiers()) {

-			if (classifier.getName().equals(type.getName())) {

-				return classifier;

-			}

-		}

-

-		for (EClassifier classifier : typesPackage.getEClassifiers()) {

-			if (classifier.getName().equals(type.getName())) {

-				return classifier;

-			}

-		}

-

-		return null;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java
deleted file mode 100644
index 39640150bc1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facadeSpecificEditor.utils;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.uml2.uml.resource.UMLResource;

-

-public class UMLModelUtils {

-

-	/**

-	 * Load a given uri as an EMF model and return the root

-	 *

-	 * @param file

-	 * @param resourceSet

-	 * @return

-	 */

-	public static EObject loadModel(URI uri, ResourceSet resourceSet) {

-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);

-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.Factory.Registry.DEFAULT_EXTENSION, UMLResource.Factory.INSTANCE);

-

-		return resourceSet.getResource(uri, true).getContents().get(0);

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<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="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project
deleted file mode 100644
index e98e2b457d7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade.edit</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c4496cc4c1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.facade;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport

-Export-Package: org.eclipse.papyrus.facade.extensiondefinition.provider,

- org.eclipse.papyrus.facade.provider,

- org.eclipse.papyrus.facade.virtualmetamodel.provider,

- org.eclipse.papyrus.facademapping.provider

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.facade.provider.FacadeEditPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/about.html b/extraplugins/facade/org.eclipse.papyrus.facade.edit/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties
deleted file mode 100644
index 76c4e6b8954..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin/

-src.includes = about.html
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif
deleted file mode 100644
index 5da4564cd4c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif
deleted file mode 100644
index 5da4564cd4c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif
deleted file mode 100644
index becf3c963f7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif
deleted file mode 100644
index 486225ee11c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif
deleted file mode 100644
index 21f89523da9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif
deleted file mode 100644
index 1010ed82e50..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif
deleted file mode 100644
index a29500a4ff0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif
deleted file mode 100644
index d9a8b0c6560..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif
deleted file mode 100644
index 5a0697e635e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif
deleted file mode 100644
index c4bac7155ca..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif
deleted file mode 100644
index f7e0ea73df1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif
deleted file mode 100644
index d5cbc02e268..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif
deleted file mode 100644
index 7a7c260f79c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif
deleted file mode 100644
index 39428c713a1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif
deleted file mode 100644
index 5a9bc7514fa..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif
deleted file mode 100644
index c8d381f0b32..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif
deleted file mode 100644
index 35ef84e20e2..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif
deleted file mode 100644
index 106881e5d9b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif
deleted file mode 100644
index badaab0664a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif
deleted file mode 100644
index b3643da048a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif
deleted file mode 100644
index 338fb8d9a72..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif
deleted file mode 100644
index 136e3b27269..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif
deleted file mode 100644
index cdd3b76e3c0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif
deleted file mode 100644
index 05dc74ad5da..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif
deleted file mode 100644
index c4fb30e9687..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif
deleted file mode 100644
index 33854e98c25..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif
deleted file mode 100644
index 83afb9b3c9a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif
deleted file mode 100644
index 5a9bc7514fa..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties
deleted file mode 100644
index f1a5aba0807..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Facade Definition Edit (Incubation)

-providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml
deleted file mode 100644
index 3eb7c459ee4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated facade -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/facade"

-            class="org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated facade -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/virtualmetamodel"

-            class="org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated facade -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/extensiondefinition"

-            class="org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated facademapping -->

-      <factory

-            uri="http://www.eclipse.org/papyrus/facademapping"

-            class="org.eclipse.papyrus.facademapping.provider.FacademappingItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade.edit/pom.xml
deleted file mode 100644
index 90e58741e57..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade.edit</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.2.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java
deleted file mode 100644
index 52314a91606..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class BaseMetaclassItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public BaseMetaclassItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addBasePropertyDescriptor(object);

-			addPossiblePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Base feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addBasePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_BaseMetaclass_base_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_BaseMetaclass_base_feature", "_UI_BaseMetaclass_type"),

-						ExtensiondefinitionPackage.Literals.BASE_METACLASS__BASE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Possible feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addPossiblePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_BaseMetaclass_possible_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_BaseMetaclass_possible_feature", "_UI_BaseMetaclass_type"),

-						ExtensiondefinitionPackage.Literals.BASE_METACLASS__POSSIBLE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

-			childrenFeatures.add(ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns BaseMetaclass.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BaseMetaclass"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		BaseMetaclass baseMetaclass = (BaseMetaclass) object;

-		return getString("_UI_BaseMetaclass_type") + " " + baseMetaclass.isPossible();

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(BaseMetaclass.class)) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES,

-						ExtensiondefinitionFactory.eINSTANCE.createCombination()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES,

-						ExtensiondefinitionFactory.eINSTANCE.createCombination()));

-	}

-

-	/**

-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

-		Object childFeature = feature;

-		Object childObject = child;

-

-		boolean qualify =

-				childFeature == ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES ||

-						childFeature == ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES;

-

-		if (qualify) {

-			return getString("_UI_CreateChild_text2",

-					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

-		}

-		return super.getCreateChildText(owner, feature, child, selection);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java
deleted file mode 100644
index d956eb03e47..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.Combination} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class CombinationItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public CombinationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addMembersPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Members feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addMembersPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Combination_members_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Combination_members_feature", "_UI_Combination_type"),

-						ExtensiondefinitionPackage.Literals.COMBINATION__MEMBERS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Combination.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Combination"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Combination_type");

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java
deleted file mode 100644
index 48cfd5cb6d8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensionDefinitionItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensionDefinitionItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addExtensionPropertyDescriptor(object);

-			addStereotypePropertyDescriptor(object);

-			addKindPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Extension feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addExtensionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ExtensionDefinition_extension_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_extension_feature", "_UI_ExtensionDefinition_type"),

-						ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__EXTENSION,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Stereotype feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addStereotypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ExtensionDefinition_stereotype_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_stereotype_feature", "_UI_ExtensionDefinition_type"),

-						ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__STEREOTYPE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Kind feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addKindPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_ExtensionDefinition_kind_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_kind_feature", "_UI_ExtensionDefinition_type"),

-						ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__KIND,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__BASE_METACLASSES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns ExtensionDefinition.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtensionDefinition"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		ExtensionDefinitionKind labelValue = ((ExtensionDefinition) object).getKind();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-				getString("_UI_ExtensionDefinition_type") :

-				getString("_UI_ExtensionDefinition_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ExtensionDefinition.class)) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__BASE_METACLASSES,

-						ExtensiondefinitionFactory.eINSTANCE.createBaseMetaclass()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java
deleted file mode 100644
index 387938803a4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionItemProviderAdapterFactory extends ExtensiondefinitionAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensionDefinitionItemProvider extensionDefinitionItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createExtensionDefinitionAdapter() {

-		if (extensionDefinitionItemProvider == null) {

-			extensionDefinitionItemProvider = new ExtensionDefinitionItemProvider(this);

-		}

-

-		return extensionDefinitionItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected BaseMetaclassItemProvider baseMetaclassItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createBaseMetaclassAdapter() {

-		if (baseMetaclassItemProvider == null) {

-			baseMetaclassItemProvider = new BaseMetaclassItemProvider(this);

-		}

-

-		return baseMetaclassItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.Combination} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CombinationItemProvider combinationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createCombinationAdapter() {

-		if (combinationItemProvider == null) {

-			combinationItemProvider = new CombinationItemProvider(this);

-		}

-

-		return combinationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (extensionDefinitionItemProvider != null) {

-			extensionDefinitionItemProvider.dispose();

-		}

-		if (baseMetaclassItemProvider != null) {

-			baseMetaclassItemProvider.dispose();

-		}

-		if (combinationItemProvider != null) {

-			combinationItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java
deleted file mode 100644
index 15a23f40682..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the central singleton for the Facade edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class FacadeEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final FacadeEditPlugin INSTANCE = new FacadeEditPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeEditPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-				UMLEditPlugin.INSTANCE,

-		});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java
deleted file mode 100644
index 782bd296f8c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.Facade} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(FacadePackage.Literals.FACADE__EXTENSION_DEFINITIONS);

-			childrenFeatures.add(FacadePackage.Literals.FACADE__VIRTUALMETAMODEL);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns Facade.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Facade"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Facade_type");

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(Facade.class)) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(FacadePackage.Literals.FACADE__EXTENSION_DEFINITIONS,

-						ExtensiondefinitionFactory.eINSTANCE.createExtensionDefinition()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(FacadePackage.Literals.FACADE__VIRTUALMETAMODEL,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualMetamodel()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java
deleted file mode 100644
index d26255daad3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.util.FacadeAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeItemProviderAdapterFactory extends FacadeAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.Facade} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeItemProvider facadeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.Facade}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createFacadeAdapter() {

-		if (facadeItemProvider == null) {

-			facadeItemProvider = new FacadeItemProvider(this);

-		}

-

-		return facadeItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (facadeItemProvider != null) {

-			facadeItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java
deleted file mode 100644
index 5fd9c237eb8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualClassifierItemProvider

-		extends VirtualElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualClassifierItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualClassifier) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualClassifier_type") :

-				getString("_UI_VirtualClassifier_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java
deleted file mode 100644
index 9a250158018..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualDatatypeItemProvider

-		extends VirtualClassifierItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualDatatypeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns VirtualDatatype.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualDatatype"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualDatatype) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualDatatype_type") :

-				getString("_UI_VirtualDatatype_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java
deleted file mode 100644
index 95e9297f8cf..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualElementItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualElementItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAliasNamePropertyDescriptor(object);

-			addKeptPropertyDescriptor(object);

-			addRepresentedElementPropertyDescriptor(object);

-			addUseRepresentedPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAliasNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualElement_aliasName_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_aliasName_feature", "_UI_VirtualElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__ALIAS_NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Kept feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addKeptPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualElement_kept_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_kept_feature", "_UI_VirtualElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__KEPT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Represented Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addRepresentedElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualElement_representedElement_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_representedElement_feature", "_UI_VirtualElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Use Represented feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addUseRepresentedPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualElement_useRepresented_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_useRepresented_feature", "_UI_VirtualElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__USE_REPRESENTED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualElement) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualElement_type") :

-				getString("_UI_VirtualElement_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualElement.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java
deleted file mode 100644
index b74c308382f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualEnumItemProvider

-		extends VirtualClassifierItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualEnumItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_ENUM__LITERALS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns VirtualEnum.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualEnum"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualEnum) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualEnum_type") :

-				getString("_UI_VirtualEnum_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualEnum.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_ENUM__LITERALS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualLiteral()));

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java
deleted file mode 100644
index 842a04dbaaa..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualLiteralItemProvider

-		extends VirtualElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualLiteralItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns VirtualLiteral.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualLiteral"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualLiteral) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualLiteral_type") :

-				getString("_UI_VirtualLiteral_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java
deleted file mode 100644
index 6af22b5f98b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualMetaclassItemProvider

-		extends VirtualClassifierItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualMetaclassItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAbstractPropertyDescriptor(object);

-			addAppliedStereotypesPropertyDescriptor(object);

-			addParentsPropertyDescriptor(object);

-			addStereotypeInterfacePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Abstract feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAbstractPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetaclass_abstract_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_abstract_feature", "_UI_VirtualMetaclass_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__ABSTRACT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Applied Stereotypes feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAppliedStereotypesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetaclass_appliedStereotypes_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_appliedStereotypes_feature", "_UI_VirtualMetaclass_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__APPLIED_STEREOTYPES,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Parents feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addParentsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetaclass_parents_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_parents_feature", "_UI_VirtualMetaclass_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PARENTS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Stereotype Interface feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addStereotypeInterfacePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetaclass_stereotypeInterface_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_stereotypeInterface_feature", "_UI_VirtualMetaclass_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__OPERATIONS);

-			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PROPERTIES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns VirtualMetaclass.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualMetaclass"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualMetaclass) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualMetaclass_type") :

-				getString("_UI_VirtualMetaclass_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualMetaclass.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__OPERATIONS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualOperation()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PROPERTIES,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualProperty()));

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java
deleted file mode 100644
index a5b4f2db7c6..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualMetamodelItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualMetamodelItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addNamePropertyDescriptor(object);

-			addNsPrefixPropertyDescriptor(object);

-			addNsURIPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetamodel_name_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_name_feature", "_UI_VirtualMetamodel_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Ns Prefix feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addNsPrefixPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetamodel_nsPrefix_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_nsPrefix_feature", "_UI_VirtualMetamodel_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NS_PREFIX,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Ns URI feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addNsURIPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualMetamodel_nsURI_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_nsURI_feature", "_UI_VirtualMetamodel_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NS_URI,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns VirtualMetamodel.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualMetamodel"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualMetamodel) object).getName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualMetamodel_type") :

-				getString("_UI_VirtualMetamodel_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualMetamodel.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualEnum()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacadeEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java
deleted file mode 100644
index e711d22052f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualOperationItemProvider

-		extends VirtualTypedElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualOperationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION__PARAMETERS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns VirtualOperation.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualOperation"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualOperation) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualOperation_type") :

-				getString("_UI_VirtualOperation_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualOperation.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION__PARAMETERS,

-						VirtualmetamodelFactory.eINSTANCE.createVirtualParameter()));

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java
deleted file mode 100644
index f4c2d36ccca..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualParameterItemProvider

-		extends VirtualTypedElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualParameterItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns VirtualParameter.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualParameter"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualParameter) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualParameter_type") :

-				getString("_UI_VirtualParameter_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java
deleted file mode 100644
index 3ff08faa2b0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualPropertyItemProvider

-		extends VirtualTypedElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualPropertyItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns VirtualProperty.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualProperty"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualProperty) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualProperty_type") :

-				getString("_UI_VirtualProperty_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java
deleted file mode 100644
index 5b1f7a653d6..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualTypedElementItemProvider

-		extends VirtualElementItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualTypedElementItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addLowerPropertyDescriptor(object);

-			addUpperPropertyDescriptor(object);

-			addTypePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Lower feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addLowerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualTypedElement_lower_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_lower_feature", "_UI_VirtualTypedElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__LOWER,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Upper feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addUpperPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualTypedElement_upper_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_upper_feature", "_UI_VirtualTypedElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__UPPER,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Type feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addTypePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_VirtualTypedElement_type_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_type_feature", "_UI_VirtualTypedElement_type"),

-						VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__TYPE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VirtualTypedElement) object).getAliasName();

-		return label == null || label.length() == 0 ?

-				getString("_UI_VirtualTypedElement_type") :

-				getString("_UI_VirtualTypedElement_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VirtualTypedElement.class)) {

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java
deleted file mode 100644
index 057586bf250..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelItemProviderAdapterFactory extends VirtualmetamodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualMetamodelItemProvider virtualMetamodelItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualMetamodelAdapter() {

-		if (virtualMetamodelItemProvider == null) {

-			virtualMetamodelItemProvider = new VirtualMetamodelItemProvider(this);

-		}

-

-		return virtualMetamodelItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualMetaclassItemProvider virtualMetaclassItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualMetaclassAdapter() {

-		if (virtualMetaclassItemProvider == null) {

-			virtualMetaclassItemProvider = new VirtualMetaclassItemProvider(this);

-		}

-

-		return virtualMetaclassItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualPropertyItemProvider virtualPropertyItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualPropertyAdapter() {

-		if (virtualPropertyItemProvider == null) {

-			virtualPropertyItemProvider = new VirtualPropertyItemProvider(this);

-		}

-

-		return virtualPropertyItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualOperationItemProvider virtualOperationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualOperationAdapter() {

-		if (virtualOperationItemProvider == null) {

-			virtualOperationItemProvider = new VirtualOperationItemProvider(this);

-		}

-

-		return virtualOperationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualParameterItemProvider virtualParameterItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualParameterAdapter() {

-		if (virtualParameterItemProvider == null) {

-			virtualParameterItemProvider = new VirtualParameterItemProvider(this);

-		}

-

-		return virtualParameterItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualDatatypeItemProvider virtualDatatypeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualDatatypeAdapter() {

-		if (virtualDatatypeItemProvider == null) {

-			virtualDatatypeItemProvider = new VirtualDatatypeItemProvider(this);

-		}

-

-		return virtualDatatypeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualEnumItemProvider virtualEnumItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualEnumAdapter() {

-		if (virtualEnumItemProvider == null) {

-			virtualEnumItemProvider = new VirtualEnumItemProvider(this);

-		}

-

-		return virtualEnumItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualLiteralItemProvider virtualLiteralItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createVirtualLiteralAdapter() {

-		if (virtualLiteralItemProvider == null) {

-			virtualLiteralItemProvider = new VirtualLiteralItemProvider(this);

-		}

-

-		return virtualLiteralItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (virtualMetamodelItemProvider != null) {

-			virtualMetamodelItemProvider.dispose();

-		}

-		if (virtualMetaclassItemProvider != null) {

-			virtualMetaclassItemProvider.dispose();

-		}

-		if (virtualPropertyItemProvider != null) {

-			virtualPropertyItemProvider.dispose();

-		}

-		if (virtualOperationItemProvider != null) {

-			virtualOperationItemProvider.dispose();

-		}

-		if (virtualParameterItemProvider != null) {

-			virtualParameterItemProvider.dispose();

-		}

-		if (virtualDatatypeItemProvider != null) {

-			virtualDatatypeItemProvider.dispose();

-		}

-		if (virtualEnumItemProvider != null) {

-			virtualEnumItemProvider.dispose();

-		}

-		if (virtualLiteralItemProvider != null) {

-			virtualLiteralItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java
deleted file mode 100644
index 720aa535a51..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingFactory;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.FacadeMappping} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeMapppingItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeMapppingItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns FacadeMappping.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FacadeMappping"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_FacadeMappping_type");

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FacadeMappping.class)) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-				(createChildParameter

-				(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS,

-						FacademappingFactory.eINSTANCE.createMapping()));

-

-		newChildDescriptors.add

-				(createChildParameter

-				(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS,

-						FacademappingFactory.eINSTANCE.createStereotypedMapping()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacademappingEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java
deleted file mode 100644
index 0f719813436..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the Facademapping edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class FacademappingEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final FacademappingEditPlugin INSTANCE = new FacademappingEditPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingEditPlugin() {

-		super(new ResourceLocator[] {

-				});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java
deleted file mode 100644
index 17fa97312ec..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.papyrus.facademapping.util.FacademappingAdapterFactory;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingItemProviderAdapterFactory extends FacademappingAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.Mapping} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MappingItemProvider mappingItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.Mapping}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createMappingAdapter() {

-		if (mappingItemProvider == null) {

-			mappingItemProvider = new MappingItemProvider(this);

-		}

-

-		return mappingItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.StereotypedMapping} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StereotypedMappingItemProvider stereotypedMappingItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.StereotypedMapping}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createStereotypedMappingAdapter() {

-		if (stereotypedMappingItemProvider == null) {

-			stereotypedMappingItemProvider = new StereotypedMappingItemProvider(this);

-		}

-

-		return stereotypedMappingItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.FacadeMappping} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeMapppingItemProvider facadeMapppingItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.FacadeMappping}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter createFacadeMapppingAdapter() {

-		if (facadeMapppingItemProvider == null) {

-			facadeMapppingItemProvider = new FacadeMapppingItemProvider(this);

-		}

-

-		return facadeMapppingItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		if (mappingItemProvider != null) {

-			mappingItemProvider.dispose();

-		}

-		if (stereotypedMappingItemProvider != null) {

-			stereotypedMappingItemProvider.dispose();

-		}

-		if (facadeMapppingItemProvider != null) {

-			facadeMapppingItemProvider.dispose();

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java
deleted file mode 100644
index c0229c431a8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.Mapping} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class MappingItemProvider

-		extends ItemProviderAdapter

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public MappingItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addUmlElementPropertyDescriptor(object);

-			addSpecificDomainElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Uml Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addUmlElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Mapping_umlElement_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Mapping_umlElement_feature", "_UI_Mapping_type"),

-						FacademappingPackage.Literals.MAPPING__UML_ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Specific Domain Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addSpecificDomainElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Mapping_specificDomainElement_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_Mapping_specificDomainElement_feature", "_UI_Mapping_type"),

-						FacademappingPackage.Literals.MAPPING__SPECIFIC_DOMAIN_ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns Mapping.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Mapping"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_Mapping_type");

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return FacademappingEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java
deleted file mode 100644
index 43cace5cca9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.StereotypedMapping} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StereotypedMappingItemProvider

-		extends MappingItemProvider

-		implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedMappingItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAppliedStereotypesPropertyDescriptor(object);

-			addKindPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Applied Stereotypes feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAppliedStereotypesPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StereotypedMapping_appliedStereotypes_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_StereotypedMapping_appliedStereotypes_feature", "_UI_StereotypedMapping_type"),

-						FacademappingPackage.Literals.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Kind feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addKindPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StereotypedMapping_kind_feature"),

-						getString("_UI_PropertyDescriptor_description", "_UI_StereotypedMapping_kind_feature", "_UI_StereotypedMapping_type"),

-						FacademappingPackage.Literals.STEREOTYPED_MAPPING__KIND,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns StereotypedMapping.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StereotypedMapping"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		ExtensionDefinitionKind labelValue = ((StereotypedMapping) object).getKind();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-				getString("_UI_StereotypedMapping_type") :

-				getString("_UI_StereotypedMapping_type") + " " + label;

-	}

-

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(StereotypedMapping.class)) {

-		case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<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="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project
deleted file mode 100644
index 5310a6aef35..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade.editor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index dfa01557b3e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.facade.edit;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport

-Export-Package: org.eclipse.papyrus.facade.extensiondefinition.presentation,

- org.eclipse.papyrus.facade.presentation,

- org.eclipse.papyrus.facade.virtualmetamodel.presentation,

- org.eclipse.papyrus.facademapping.presentation

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin$Implementation

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/about.html b/extraplugins/facade/org.eclipse.papyrus.facade.editor/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties
deleted file mode 100644
index fd275439f53..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin

-src.includes = about.html
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif
deleted file mode 100644
index 82d83d1334f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif
deleted file mode 100644
index 7ede4ac8f48..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif
deleted file mode 100644
index 8a944104572..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif
deleted file mode 100644
index 9e5e19a7405..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif
deleted file mode 100644
index 7b4e56dd8c9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif
deleted file mode 100644
index e3b9c14a6a6..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif
deleted file mode 100644
index 92c8b752980..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif
deleted file mode 100644
index 5db54235cf4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties
deleted file mode 100644
index 9802753e421..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-#

-

-pluginName = Facade Editor (Incubation)

-providerName = Eclipse Modeling Project

-

-_UI_FacadeEditor_menu = &Facade Editor

-_UI_VirtualmetamodelEditor_menu = &Virtualmetamodel Editor

-_UI_ExtensiondefinitionEditor_menu = &Extensiondefinition Editor

-

-_UI_CreateChild_menu_item = &New Child

-_UI_CreateSibling_menu_item = N&ew Sibling

-

-_UI_ShowPropertiesView_menu_item = Show &Properties View

-_UI_RefreshViewer_menu_item = &Refresh

-

-_UI_SelectionPage_label = Selection

-_UI_ParentPage_label = Parent

-_UI_ListPage_label = List

-_UI_TreePage_label = Tree

-_UI_TablePage_label = Table

-_UI_TreeWithColumnsPage_label = Tree with Columns

-_UI_ObjectColumn_label = Object

-_UI_SelfColumn_label = Self

-

-_UI_NoObjectSelected = Selected Nothing

-_UI_SingleObjectSelected = Selected Object: {0}

-_UI_MultiObjectSelected = Selected {0} Objects

-

-_UI_OpenEditorError_label = Open Editor

-

-_UI_Wizard_category = Example EMF Model Creation Wizards

-

-_UI_CreateModelError_message = Problems encountered in file "{0}"

-

-_UI_FacadeModelWizard_label = Facade Model

-_UI_FacadeModelWizard_description = Create a new Facade model

-

-_UI_FacadeEditor_label = Facade Model Editor

-

-_UI_FacadeEditorFilenameDefaultBase = My

-_UI_FacadeEditorFilenameExtensions = facade

-

-_UI_VirtualmetamodelModelWizard_label = Virtualmetamodel Model

-_UI_VirtualmetamodelModelWizard_description = Create a new Virtualmetamodel model

-

-_UI_VirtualmetamodelEditor_label = Virtualmetamodel Model Editor

-

-_UI_VirtualmetamodelEditorFilenameDefaultBase = My

-_UI_VirtualmetamodelEditorFilenameExtensions = virtualmetamodel

-

-_UI_ExtensiondefinitionModelWizard_label = Extensiondefinition Model

-_UI_ExtensiondefinitionModelWizard_description = Create a new Extensiondefinition model

-

-_UI_ExtensiondefinitionEditor_label = Extensiondefinition Model Editor

-

-_UI_ExtensiondefinitionEditorFilenameDefaultBase = My

-_UI_ExtensiondefinitionEditorFilenameExtensions = extensiondefinition

-

-_UI_Wizard_label = New

-

-_WARN_FilenameExtension = The file name must end in ''.{0}''

-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

-

-_UI_ModelObject = &Model Object

-_UI_XMLEncoding = &XML Encoding

-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

-_UI_Wizard_initial_object_description = Select a model object to create

-

-_UI_FileConflict_label = File Conflict

-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

-

-_UI_FacademappingEditor_menu = &Facademapping Editor

-
_UI_FacademappingModelWizard_label = Facademapping Model

-_UI_FacademappingModelWizard_description = Create a new Facademapping model

-
_UI_FacademappingEditor_label = Facademapping Model Editor

-
_UI_FacademappingEditorFilenameDefaultBase = My

-_UI_FacademappingEditorFilenameExtensions = facademapping

-


diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml
deleted file mode 100644
index b634852e869..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated facade -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.facade.presentation.FacadeModelWizardID"

-            name="%_UI_FacadeModelWizard_label"

-            class="org.eclipse.papyrus.facade.presentation.FacadeModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/FacadeModelFile.gif">

-         <description>%_UI_FacadeModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated facademapping -->

-      <editor

-            id="org.eclipse.papyrus.facademapping.presentation.FacademappingEditorID"

-            name="%_UI_FacademappingEditor_label"

-            icon="icons/full/obj16/FacademappingModelFile.gif"

-            extensions="facademapping"

-            class="org.eclipse.papyrus.facademapping.presentation.FacademappingEditor"

-            contributorClass="org.eclipse.papyrus.facademapping.presentation.FacademappingActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated facade -->

-      <editor

-            id="org.eclipse.papyrus.facade.presentation.FacadeEditorID"

-            name="%_UI_FacadeEditor_label"

-            icon="icons/full/obj16/FacadeModelFile.gif"

-            extensions="facade"

-            class="org.eclipse.papyrus.facade.presentation.FacadeEditor"

-            contributorClass="org.eclipse.papyrus.facade.presentation.FacadeActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated facade -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelModelWizardID"

-            name="%_UI_VirtualmetamodelModelWizard_label"

-            class="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/VirtualmetamodelModelFile.gif">

-         <description>%_UI_VirtualmetamodelModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated facade -->

-      <editor

-            id="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelEditorID"

-            name="%_UI_VirtualmetamodelEditor_label"

-            icon="icons/full/obj16/VirtualmetamodelModelFile.gif"

-            extensions="virtualmetamodel"

-            class="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelEditor"

-            contributorClass="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelActionBarContributor">

-      </editor>

-   </extension>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <!-- @generated facade -->

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionModelWizardID"

-            name="%_UI_ExtensiondefinitionModelWizard_label"

-            class="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/ExtensiondefinitionModelFile.gif">

-         <description>%_UI_ExtensiondefinitionModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-null

-   <extension point="org.eclipse.ui.editors">

-      <!-- @generated facade -->

-      <editor

-            id="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionEditorID"

-            name="%_UI_ExtensiondefinitionEditor_label"

-            icon="icons/full/obj16/ExtensiondefinitionModelFile.gif"

-            extensions="extensiondefinition"

-            class="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionEditor"

-            contributorClass="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionActionBarContributor">

-      </editor>

-   </extension>

-

-</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade.editor/pom.xml
deleted file mode 100644
index f0027334cf3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade.editor</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.2.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java
deleted file mode 100644
index 970cc38fbe9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Extensiondefinition model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-				@Override

-				public boolean isEnabled() {

-					return activeEditorPart instanceof IViewerProvider;

-				}

-

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

-					}

-				}

-			};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("extensiondefinition-settings"));

-		toolBarManager.add(new Separator("extensiondefinition-additions"));

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditor_menu"), "org.eclipse.papyrus.facade.extensiondefinitionMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java
deleted file mode 100644
index e2b60392872..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java
+++ /dev/null
@@ -1,1904 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

-

-

-/**

- * This is an example of a Extensiondefinition model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(ExtensiondefinitionEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(ExtensiondefinitionEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == ExtensiondefinitionEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											@Override

-											public void run() {

-												updateProblemIndication();

-											}

-										});

-							}

-							break;

-						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

-					}

-				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

-				}

-

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							@Override

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

-										}

-									}

-									return false;

-								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

-							}

-

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

-						}

-

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(ExtensiondefinitionEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == ExtensiondefinitionEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

-

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(ExtensiondefinitionEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				} catch (PartInitException exception) {

-					FacadeEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

-				(getSite().getShell(),

-						getString("_UI_FileConflict_label"),

-						getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-					new Runnable() {

-						@Override

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

-						}

-					};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							@Override

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp");

-		contextMenu.add(new Separator("additions"));

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()),

-							new Object[] { exception == null ? (Object) resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR,

-					"org.eclipse.papyrus.facade.editor",

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()),

-					new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer) viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String[] { "a", "b" });

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						@Override

-						public void run() {

-							setActivePage(0);

-						}

-					});

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

-					}

-				});

-

-		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					@Override

-					public void run() {

-						updateProblemIndication();

-					}

-				});

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						@Override

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						ExtensiondefinitionEditor.this.setSelectionToViewer(selection);

-						ExtensiondefinitionEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

-					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-								}

-								first = false;

-							}

-						}

-					}

-				};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			FacadeEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		} catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

-				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-					break;

-				}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return FacadeEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java
deleted file mode 100644
index fe08aa3a651..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensiondefinitionPackage extensiondefinitionPackage = ExtensiondefinitionPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensiondefinitionFactory extensiondefinitionFactory = extensiondefinitionPackage.getExtensiondefinitionFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensiondefinitionModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensiondefinitionModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewExtensiondefinition")));

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : extensiondefinitionPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass) extensiondefinitionPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = extensiondefinitionFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								FacadeEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

-							}

-						}

-					};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							@Override

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			FacadeEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ExtensiondefinitionModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ExtensiondefinitionModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ExtensiondefinitionModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ExtensiondefinitionModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-					@Override

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				FacadeEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new ExtensiondefinitionModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_label"));

-		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_description"));

-		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource) selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new ExtensiondefinitionModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_label"));

-		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java
deleted file mode 100644
index d84b392e63f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Facade model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-				@Override

-				public boolean isEnabled() {

-					return activeEditorPart instanceof IViewerProvider;

-				}

-

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

-					}

-				}

-			};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("facade-settings"));

-		toolBarManager.add(new Separator("facade-additions"));

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditor_menu"), "org.eclipse.papyrus.facadeMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java
deleted file mode 100644
index 1b99a3c8b0c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java
+++ /dev/null
@@ -1,1903 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

-

-

-/**

- * This is an example of a Facade model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(FacadeEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(FacadeEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == FacadeEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											@Override

-											public void run() {

-												updateProblemIndication();

-											}

-										});

-							}

-							break;

-						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

-					}

-				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

-				}

-

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							@Override

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

-										}

-									}

-									return false;

-								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

-							}

-

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

-						}

-

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(FacadeEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == FacadeEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

-

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(FacadeEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				} catch (PartInitException exception) {

-					FacadeEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

-				(getSite().getShell(),

-						getString("_UI_FileConflict_label"),

-						getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-					new Runnable() {

-						@Override

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

-						}

-					};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							@Override

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp");

-		contextMenu.add(new Separator("additions"));

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()),

-							new Object[] { exception == null ? (Object) resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR,

-					"org.eclipse.papyrus.facade.editor",

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()),

-					new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer) viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String[] { "a", "b" });

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacadeEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						@Override

-						public void run() {

-							setActivePage(0);

-						}

-					});

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

-					}

-				});

-

-		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					@Override

-					public void run() {

-						updateProblemIndication();

-					}

-				});

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						@Override

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						FacadeEditor.this.setSelectionToViewer(selection);

-						FacadeEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

-					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-								}

-								first = false;

-							}

-						}

-					}

-				};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			FacadeEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		} catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

-				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-					break;

-				}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return FacadeEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java
deleted file mode 100644
index c6176d63f92..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the central singleton for the Facade editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class FacadeEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final FacadeEditorPlugin INSTANCE = new FacadeEditorPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeEditorPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-				UMLEditPlugin.INSTANCE,

-		});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipseUIPlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java
deleted file mode 100644
index 4a24ad6a08b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.facade.FacadeFactory;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadePackage facadePackage = FacadePackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeFactory facadeFactory = facadePackage.getFacadeFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewFacade")));

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : facadePackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass) facadePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = facadeFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								FacadeEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

-							}

-						}

-					};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							@Override

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			FacadeEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class FacadeModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public FacadeModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class FacadeModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public FacadeModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-					@Override

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				FacadeEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new FacadeModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_label"));

-		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_description"));

-		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource) selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new FacadeModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_label"));

-		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java
deleted file mode 100644
index e29d8278d8c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Virtualmetamodel model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-				@Override

-				public boolean isEnabled() {

-					return activeEditorPart instanceof IViewerProvider;

-				}

-

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

-					}

-				}

-			};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("virtualmetamodel-settings"));

-		toolBarManager.add(new Separator("virtualmetamodel-additions"));

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditor_menu"), "org.eclipse.papyrus.facade.virtualmetamodelMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java
deleted file mode 100644
index 223fde601b7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java
+++ /dev/null
@@ -1,1904 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

-

-

-/**

- * This is an example of a Virtualmetamodel model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(VirtualmetamodelEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(VirtualmetamodelEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == VirtualmetamodelEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											@Override

-											public void run() {

-												updateProblemIndication();

-											}

-										});

-							}

-							break;

-						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

-					}

-				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

-				}

-

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							@Override

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

-										}

-									}

-									return false;

-								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

-							}

-

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

-						}

-

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(VirtualmetamodelEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == VirtualmetamodelEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

-

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(VirtualmetamodelEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				} catch (PartInitException exception) {

-					FacadeEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						FacadeEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

-				(getSite().getShell(),

-						getString("_UI_FileConflict_label"),

-						getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-					new Runnable() {

-						@Override

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

-						}

-					};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							@Override

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp");

-		contextMenu.add(new Separator("additions"));

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()),

-							new Object[] { exception == null ? (Object) resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR,

-					"org.eclipse.papyrus.facade.editor",

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()),

-					new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer) viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String[] { "a", "b" });

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						@Override

-						public void run() {

-							setActivePage(0);

-						}

-					});

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

-					}

-				});

-

-		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					@Override

-					public void run() {

-						updateProblemIndication();

-					}

-				});

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						@Override

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						VirtualmetamodelEditor.this.setSelectionToViewer(selection);

-						VirtualmetamodelEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

-					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-								}

-								first = false;

-							}

-						}

-					}

-				};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			FacadeEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		} catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

-				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-					break;

-				}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return FacadeEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java
deleted file mode 100644
index 7bee6de379e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

-import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualmetamodelPackage virtualmetamodelPackage = VirtualmetamodelPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualmetamodelFactory virtualmetamodelFactory = virtualmetamodelPackage.getVirtualmetamodelFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualmetamodelModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualmetamodelModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewVirtualmetamodel")));

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : virtualmetamodelPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass) virtualmetamodelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = virtualmetamodelFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								FacadeEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

-							}

-						}

-					};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							@Override

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			FacadeEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class VirtualmetamodelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public VirtualmetamodelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class VirtualmetamodelModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public VirtualmetamodelModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-					@Override

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				FacadeEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new VirtualmetamodelModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_label"));

-		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_description"));

-		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource) selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new VirtualmetamodelModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_label"));

-		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java
deleted file mode 100644
index 1de1b2b963c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Facademapping model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingActionBarContributor

-		extends EditingDomainActionBarContributor

-		implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-			new Action(FacademappingEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-				@Override

-				public void run() {

-					try {

-						getPage().showView("org.eclipse.ui.views.PropertySheet");

-					}

-					catch (PartInitException exception) {

-						FacademappingEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-			new Action(FacademappingEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-				@Override

-				public boolean isEnabled() {

-					return activeEditorPart instanceof IViewerProvider;

-				}

-

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

-					}

-				}

-			};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("facademapping-settings"));

-		toolBarManager.add(new Separator("facademapping-additions"));

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditor_menu"), "org.eclipse.papyrus.facademappingMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-				(new IMenuListener() {

-					@Override

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java
deleted file mode 100644
index 519faf726b4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java
+++ /dev/null
@@ -1,1895 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.facademapping.provider.FacademappingItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Facademapping model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-				@Override

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(FacademappingEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(FacademappingEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == FacademappingEditor.this) {

-						handleActivate();

-					}

-				}

-

-				@Override

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				@Override

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											@Override

-											public void run() {

-												updateProblemIndication();

-											}

-										});

-							}

-							break;

-						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

-					}

-				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

-				}

-

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				@Override

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							@Override

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

-										}

-									}

-									return false;

-								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

-							}

-

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

-						}

-

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(FacademappingEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										@Override

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == FacademappingEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						FacademappingEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

-

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(FacademappingEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				} catch (PartInitException exception) {

-					FacademappingEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						FacademappingEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

-				(getSite().getShell(),

-						getString("_UI_FileConflict_label"),

-						getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new FacademappingItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					@Override

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									@Override

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-					new Runnable() {

-						@Override

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

-						}

-					};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object[] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							@Override

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp");

-		contextMenu.add(new Separator("additions"));

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR,

-							"org.eclipse.papyrus.facade.editor",

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()),

-							new Object[] { exception == null ? (Object) resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR,

-					"org.eclipse.papyrus.facade.editor",

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()),

-					new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer) viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String[] { "a", "b" });

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						@Override

-						public void run() {

-							setActivePage(0);

-						}

-					});

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

-					}

-				});

-

-		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					@Override

-					public void run() {

-						updateProblemIndication();

-					}

-				});

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						@Override

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						FacademappingEditor.this.setSelectionToViewer(selection);

-						FacademappingEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

-					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-								}

-								first = false;

-							}

-						}

-					}

-				};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			FacademappingEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		} catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

-				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-					break;

-				}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return FacademappingEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return FacademappingEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java
deleted file mode 100644
index 68a4aef36e2..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the Facademapping editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class FacademappingEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final FacademappingEditorPlugin INSTANCE = new FacademappingEditorPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingEditorPlugin() {

-		super(new ResourceLocator[] {

-				});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipseUIPlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java
deleted file mode 100644
index 8cfe6fb1d3b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.emf.common.CommonPlugin;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.facademapping.FacademappingFactory;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.provider.FacademappingEditPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-			Collections.unmodifiableList(Arrays.asList(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-			FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacademappingPackage facademappingPackage = FacademappingPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacademappingFactory facademappingFactory = facademappingPackage.getFacademappingFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacademappingModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacademappingModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacademappingEditorPlugin.INSTANCE.getImage("full/wizban/NewFacademapping")));

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : facademappingPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass) facademappingPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = facademappingFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								FacademappingEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

-							}

-						}

-					};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							@Override

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), FacademappingEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		} catch (Exception exception) {

-			FacademappingEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class FacademappingModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public FacademappingModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(FacademappingEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public class FacademappingModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 *            <!-- begin-user-doc -->

-		 *            <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public FacademappingModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(FacademappingEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(FacademappingEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected ModifyListener validator =

-				new ModifyListener() {

-					@Override

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return FacademappingEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			} catch (MissingResourceException mre) {

-				FacademappingEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(FacademappingEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new FacademappingModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_label"));

-		newFileCreationPage.setDescription(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_description"));

-		newFileCreationPage.setFileName(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource) selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new FacademappingModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_label"));

-		initialObjectCreationPage.setDescription(FacademappingEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project
deleted file mode 100644
index 144fa985ce3..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade.utils</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.6

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
deleted file mode 100644
index 37fa029c421..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.facade.utils,

- org.eclipse.papyrus.facade.utils.wrappinglist,

- org.eclipse.papyrus.facade.utils.wrappinglist.subset

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.emf.common

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.facade.utils.FacadeUtilsActivator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade.utils

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Bundle-Vendor: %providerName

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/about.html b/extraplugins/facade/org.eclipse.papyrus.facade.utils/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties
deleted file mode 100644
index 671eb6e170f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.properties,\

-               about.html

-src.includes = about.html
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.utils/plugin.properties
deleted file mode 100644
index 99bd5133c5c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Facade Utils (Incubation)

-providerName = Eclipse Modeling Project

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade.utils/pom.xml
deleted file mode 100644
index 4e3fe5d50d5..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade.utils</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<groupId>org.eclipse.papyrus</groupId>

-	<version>1.2.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java
deleted file mode 100644
index 7ce3794566d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils;

-

-import java.math.BigInteger;

-

-public class CombinationGenerator {

-

-	private int[] a;

-

-	private int n;

-

-	private int r;

-

-	private BigInteger numLeft;

-

-	private BigInteger total;

-

-	public CombinationGenerator(int n, int r) {

-		if (r > n) {

-			throw new IllegalArgumentException();

-		}

-		if (n < 1) {

-			throw new IllegalArgumentException();

-		}

-		this.n = n;

-		this.r = r;

-		a = new int[r];

-		BigInteger nFact = getFactorial(n);

-		BigInteger rFact = getFactorial(r);

-		BigInteger nminusrFact = getFactorial(n - r);

-		total = nFact.divide(rFact.multiply(nminusrFact));

-		reset();

-	}

-

-	/**

-	 * Reset the generator

-	 */

-	public void reset() {

-		for (int i = 0; i < a.length; i++) {

-			a[i] = i;

-		}

-		numLeft = new BigInteger(total.toString());

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         number of combinations not yet generated

-	 */

-	public BigInteger getNumLeft() {

-		return numLeft;

-	}

-

-	/**

-	 *

-	 * @return true if there are more combinations

-	 */

-	public boolean hasMore() {

-		return numLeft.compareTo(BigInteger.ZERO) == 1;

-	}

-

-	/**

-	 *

-	 * @return total number of combinations

-	 */

-	public BigInteger getTotal() {

-		return total;

-	}

-

-

-	/**

-	 * Compute the factorial of n

-	 *

-	 * @param n

-	 * @return fact(n)

-	 */

-	private static BigInteger getFactorial(int n) {

-		BigInteger fact = BigInteger.ONE;

-		for (int i = n; i > 1; i--) {

-			fact = fact.multiply(new BigInteger(Integer.toString(i)));

-		}

-		return fact;

-	}

-

-	/**

-	 * Generate next combination (algorithm from Rosen)

-	 *

-	 * @return next combination from generator

-	 */

-	public int[] getNext() {

-

-		if (numLeft.equals(total)) {

-			numLeft = numLeft.subtract(BigInteger.ONE);

-			return a;

-		}

-

-		int i = r - 1;

-		while (a[i] == n - r + i) {

-			i--;

-		}

-		a[i] = a[i] + 1;

-		for (int j = i + 1; j < r; j++) {

-			a[j] = a[i] + j - i;

-		}

-

-		numLeft = numLeft.subtract(BigInteger.ONE);

-		return a;

-

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java
deleted file mode 100644
index 986f788914d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils;

-

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-public class FacadeUtilsActivator implements BundleActivator {

-

-	private static BundleContext context;

-

-	static BundleContext getContext() {

-		return context;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext bundleContext) throws Exception {

-		FacadeUtilsActivator.context = bundleContext;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext bundleContext) throws Exception {

-		FacadeUtilsActivator.context = null;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java
deleted file mode 100644
index b7dd3a32af0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.facade.utils;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-
-public interface RepresentingElement {
-
-	public EObject get__Represented();
-
-	public void set__Represented(EObject represented);
-
-}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java
deleted file mode 100644
index 85cfea5b35f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingEObjectContainmentEList<E extends RepresentingElement> extends EObjectContainmentEList<E> implements WrappingList<E> {

-

-	protected Collection<Element> representedElementList;

-

-	public WrappingEObjectContainmentEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList) {

-		super(dataClass, owner, featureID);

-		this.representedElementList = representedElementList;

-	}

-

-	@Override

-	public boolean add(E object) {

-

-		if (!representedElementList.contains(object.get__Represented())) {

-			representedElementList.add((Element) object.get__Represented());

-		}

-

-		if (isUnique() && contains(object)) {

-			return false;

-		} else {

-			super.doAddUnique(object);

-			if (hasInverse()) {

-				inverseAdd(object, null);

-			}

-

-			return true;

-		}

-

-		// return super.add(object);

-	}

-

-	@Override

-	public void add(int index, E e) {

-		if (!representedElementList.contains((e).get__Represented())) {

-			representedElementList.add((Element) (e).get__Represented());

-		}

-

-		super.doAddUnique(index, e);

-		if (hasInverse()) {

-			inverseAdd(e, null);

-		}

-

-		// super.add(index, e);

-	}

-

-	@Override

-	public boolean addAll(Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			for (E e : collection) {

-				super.doAddUnique(e);

-				if (hasInverse()) {

-					inverseAdd(e, null);

-				}

-			}

-			return true;

-		}

-

-		// return super.addAll(collection);

-	}

-

-	@Override

-	public boolean addAll(int index, Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			int collectionSize = collection.size();

-

-			super.doAddAllUnique(index, collection);

-

-			if (hasInverse()) {

-				int lastIndex = index + collectionSize;

-				for (int i = index; i < lastIndex; ++i) {

-					@SuppressWarnings("unchecked")

-					E object = (E) data[i];

-					inverseAdd(object, null);

-				}

-			}

-			return true;

-		}

-	}

-

-

-	@Override

-	public boolean remove(Object object) {

-		Object representedElement = ((RepresentingElement) object).get__Represented();

-		representedElementList.remove(representedElement);

-

-		if (this.contains(object)) {

-			E oldObject = doRemove(indexOf(object));

-			if (hasInverse() && oldObject != null) {

-				inverseRemove(oldObject, null);

-			}

-			return true;

-		} else {

-			return false;

-		}

-		// return oldObject;

-

-		// return super.remove(object);

-	}

-

-	@Override

-	public E remove(int index) {

-		Object representedElement = ((RepresentingElement) this.get(index)).get__Represented();

-		representedElementList.remove(representedElement);

-

-

-		E oldObject = doRemove(index);

-		if (hasInverse() && oldObject != null) {

-			inverseRemove(oldObject, null);

-		}

-		return oldObject;

-

-		// return super.remove(index);

-	}

-

-	@Override

-	public boolean removeAll(Collection<?> collection) {

-		for (Object object : collection) {

-			Object representedElement = ((RepresentingElement) object).get__Represented();

-			representedElementList.remove(representedElement);

-		}

-

-		boolean result = false;

-

-		for (Object object : collection) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-				result = true;

-			}

-		}

-		return result;

-

-		// return super.removeAll(collection);

-	}

-

-	@Override

-	public void clear() {

-

-		representedElementList.clear();

-

-		for (Object object : this) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-

-			}

-		}

-

-

-		// super.clear();

-	}

-

-	@Override

-	public void notWrappingAdd(E object) {

-		doAddUnique(object);

-

-

-

-	}

-

-	@Override

-	public E notWrappingRemove(E object) {

-

-		return doRemove(indexOf(object));

-	}

-

-

-

-

-	@Override

-	public void silentAdd(int index, E object) {

-

-		super.doAddUnique(index, object);

-		if (hasInverse()) {

-			inverseAdd(object, null);

-		}

-

-	}

-

-

-	@Override

-	public E silentRemove(int index) {

-		E oldObject = super.doRemove(index);

-		if (hasInverse() && oldObject != null) {

-			inverseRemove(oldObject, null);

-

-		}

-		return oldObject;

-	}

-

-

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java
deleted file mode 100644
index 2546ec9d202..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingEObjectContainmentWithInverseEList<E extends RepresentingElement> extends EObjectContainmentWithInverseEList<E> implements WrappingList<E> {

-

-	protected Collection<Element> representedElementList;

-

-	public WrappingEObjectContainmentWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

-		super(dataClass, owner, featureID, inverseFeatureID);

-		this.representedElementList = representedElementList;

-	}

-

-	@Override

-	public boolean add(E object) {

-

-		if (!representedElementList.contains(object.get__Represented())) {

-			representedElementList.add((Element) object.get__Represented());

-		}

-

-		if (isUnique() && contains(object)) {

-			return false;

-		} else {

-			super.doAddUnique(object);

-			if (hasInverse()) {

-				inverseAdd(object, null);

-			}

-			return true;

-		}

-

-		// return super.add(object);

-	}

-

-	@Override

-	public void add(int index, E e) {

-		if (!representedElementList.contains((e).get__Represented())) {

-			representedElementList.add((Element) (e).get__Represented());

-		}

-

-		super.doAddUnique(index, e);

-		if (hasInverse()) {

-			inverseAdd(e, null);

-		}

-

-		// super.add(index, e);

-	}

-

-	@Override

-	public boolean addAll(Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			for (E e : collection) {

-				super.doAddUnique(e);

-				if (hasInverse()) {

-					inverseAdd(e, null);

-				}

-			}

-			return true;

-		}

-

-		// return super.addAll(collection);

-	}

-

-	@Override

-	public boolean addAll(int index, Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			int collectionSize = collection.size();

-

-			super.doAddAllUnique(index, collection);

-

-			if (hasInverse()) {

-				int lastIndex = index + collectionSize;

-				for (int i = index; i < lastIndex; ++i) {

-					@SuppressWarnings("unchecked")

-					E object = (E) data[i];

-					inverseAdd(object, null);

-				}

-			}

-			return true;

-		}

-	}

-

-	@Override

-	public boolean remove(Object object) {

-		Object representedElement = ((RepresentingElement) object).get__Represented();

-		representedElementList.remove(representedElement);

-

-		if (this.contains(object)) {

-			E oldObject = doRemove(indexOf(object));

-			if (hasInverse() && oldObject != null) {

-				inverseRemove(oldObject, null);

-			}

-			return true;

-		} else {

-			return false;

-		}

-		// return oldObject;

-

-		// return super.remove(object);

-	}

-

-	@Override

-	public E remove(int index) {

-		Object representedElement = ((RepresentingElement) this.get(index)).get__Represented();

-		representedElementList.remove(representedElement);

-

-

-		E oldObject = doRemove(index);

-		if (hasInverse() && oldObject != null) {

-			inverseRemove(oldObject, null);

-		}

-		return oldObject;

-

-		// return super.remove(index);

-	}

-

-	@Override

-	public boolean removeAll(Collection<?> collection) {

-		for (Object object : collection) {

-			Object representedElement = ((RepresentingElement) object).get__Represented();

-			representedElementList.remove(representedElement);

-		}

-

-		boolean result = false;

-

-		for (Object object : collection) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-				result = true;

-			}

-		}

-		return result;

-

-		// return super.removeAll(collection);

-	}

-

-	@Override

-	public void clear() {

-		representedElementList.clear();

-

-		for (Object object : this) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-			}

-		}

-

-		// super.clear();

-	}

-

-	@Override

-	public void notWrappingAdd(E object) {

-		doAddUnique(object);

-	}

-

-	@Override

-	public E notWrappingRemove(E object) {

-		return doRemove(indexOf(object));

-	}

-

-	@Override

-	public void silentAdd(int index, E object) {

-		super.doAddUnique(index, object);

-		if (hasInverse()) {

-			inverseAdd(object, null);

-		}

-	}

-

-	@Override

-	public E silentRemove(int index) {

-		E oldObject = super.doRemove(index);

-		if (hasInverse() && oldObject != null) {

-			inverseRemove(oldObject, null);

-

-		}

-		return oldObject;

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java
deleted file mode 100644
index 98f58ad8d7e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectEList;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingEObjectEList<E extends RepresentingElement> extends EObjectEList<E> implements WrappingList<E> {

-

-	protected Collection<Element> representedElementList;

-

-	public WrappingEObjectEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList) {

-		super(dataClass, owner, featureID);

-		this.representedElementList = representedElementList;

-	}

-

-	@Override

-	public boolean add(E object) {

-

-		if (!representedElementList.contains(object.get__Represented())) {

-			representedElementList.add((Element) object.get__Represented());

-		}

-

-		if (isUnique() && contains(object)) {

-			return false;

-		} else {

-			super.doAddUnique(object);

-			if (hasInverse()) {

-				inverseAdd(object, null);

-			}

-

-			return true;

-		}

-

-		// return super.add(object);

-	}

-

-	@Override

-	public void add(int index, E e) {

-		if (!representedElementList.contains((e).get__Represented())) {

-			representedElementList.add((Element) (e).get__Represented());

-		}

-

-		super.doAddUnique(index, e);

-		if (hasInverse()) {

-			inverseAdd(e, null);

-		}

-

-		// super.add(index, e);

-	}

-

-	@Override

-	public boolean addAll(Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			for (E e : collection) {

-				super.doAddUnique(e);

-				if (hasInverse()) {

-					inverseAdd(e, null);

-				}

-			}

-			return true;

-		}

-

-		// return super.addAll(collection);

-	}

-

-	@Override

-	public boolean addAll(int index, Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			int collectionSize = collection.size();

-

-			super.doAddAllUnique(index, collection);

-

-			if (hasInverse()) {

-				int lastIndex = index + collectionSize;

-				for (int i = index; i < lastIndex; ++i) {

-					@SuppressWarnings("unchecked")

-					E object = (E) data[i];

-					inverseAdd(object, null);

-				}

-			}

-			return true;

-		}

-	}

-

-

-	@Override

-	public boolean remove(Object object) {

-		Object representedElement = ((RepresentingElement) object).get__Represented();

-		representedElementList.remove(representedElement);

-

-		if (this.contains(object)) {

-			E oldObject = doRemove(indexOf(object));

-			if (hasInverse() && oldObject != null) {

-				inverseRemove(oldObject, null);

-			}

-			return true;

-		} else {

-			return false;

-		}

-		// return oldObject;

-

-		// return super.remove(object);

-	}

-

-	@Override

-	public E remove(int index) {

-		Object representedElement = ((RepresentingElement) this.get(index)).get__Represented();

-		representedElementList.remove(representedElement);

-

-

-		E oldObject = doRemove(index);

-		if (hasInverse() && oldObject != null) {

-			inverseRemove(oldObject, null);

-		}

-		return oldObject;

-

-		// return super.remove(index);

-	}

-

-	@Override

-	public boolean removeAll(Collection<?> collection) {

-		for (Object object : collection) {

-			Object representedElement = ((RepresentingElement) object).get__Represented();

-			representedElementList.remove(representedElement);

-		}

-

-		boolean result = false;

-

-		for (Object object : collection) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-				result = true;

-			}

-		}

-		return result;

-

-		// return super.removeAll(collection);

-	}

-

-	@Override

-	public void clear() {

-

-		representedElementList.clear();

-

-		for (Object object : this) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				if (hasInverse() && oldObject != null) {

-					inverseRemove(oldObject, null);

-				}

-

-			}

-		}

-

-

-		// super.clear();

-	}

-

-	@Override

-	public void notWrappingAdd(E object) {

-		doAddUnique(object);

-

-

-

-	}

-

-	@Override

-	public E notWrappingRemove(E object) {

-

-		return doRemove(indexOf(object));

-	}

-

-

-

-

-	@Override

-	public void silentAdd(int index, E object) {

-

-		super.doAddUnique(index, object);

-

-	}

-

-

-	@Override

-	public E silentRemove(int index) {

-		return super.doRemove(index);

-

-	}

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java
deleted file mode 100644
index ab8bc3817da..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectWithInverseEList;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingEObjectWithInverseEList<E extends RepresentingElement> extends EObjectWithInverseEList<E> implements WrappingList<E> {

-

-	public static class WrappingManyInverse<E> extends WrappingEObjectWithInverseEList {

-

-		private static final long serialVersionUID = 1L;

-

-		public WrappingManyInverse(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

-			super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

-		}

-

-		@Override

-		protected boolean hasManyInverse() {

-			return true;

-		}

-	}

-

-	protected Collection<Element> representedElementList;

-

-	public WrappingEObjectWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

-		super(dataClass, owner, featureID, inverseFeatureID);

-		this.representedElementList = representedElementList;

-	}

-

-	@Override

-	public boolean add(E object) {

-

-		if (!representedElementList.contains(object.get__Represented())) {

-			representedElementList.add((Element) object.get__Represented());

-		}

-

-		if (isUnique() && contains(object)) {

-			return false;

-		} else {

-			super.doAddUnique(object);

-

-			return true;

-		}

-

-	}

-

-	@Override

-	public void add(int index, E e) {

-		if (!representedElementList.contains((e).get__Represented())) {

-			representedElementList.add((Element) (e).get__Represented());

-		}

-

-		super.doAddUnique(index, e);

-	}

-

-	@Override

-	public boolean addAll(Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			for (E e : collection) {

-				super.doAddUnique(e);

-			}

-			return true;

-		}

-

-	}

-

-	@Override

-	public boolean addAll(int index, Collection<? extends E> collection) {

-		for (E e : collection) {

-			if (!representedElementList.contains(e.get__Represented())) {

-				representedElementList.add((Element) e.get__Represented());

-			}

-		}

-

-		if (collection.isEmpty()) {

-			return false;

-		} else {

-			super.doAddAllUnique(index, collection);

-			return true;

-		}

-	}

-

-

-	@Override

-	public boolean remove(Object object) {

-		Object representedElement = ((RepresentingElement) object).get__Represented();

-		representedElementList.remove(representedElement);

-

-		if (this.contains(object)) {

-			E oldObject = doRemove(indexOf(object));

-			return true;

-		} else {

-			return false;

-		}

-

-	}

-

-	@Override

-	public E remove(int index) {

-		Object representedElement = ((RepresentingElement) this.get(index)).get__Represented();

-		representedElementList.remove(representedElement);

-

-

-		E oldObject = doRemove(index);

-

-		return oldObject;

-	}

-

-	@Override

-	public boolean removeAll(Collection<?> collection) {

-		for (Object object : collection) {

-			Object representedElement = ((RepresentingElement) object).get__Represented();

-			representedElementList.remove(representedElement);

-		}

-

-		boolean result = false;

-

-		for (Object object : collection) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-				result = true;

-			}

-		}

-		return result;

-	}

-

-	@Override

-	public void clear() {

-

-		representedElementList.clear();

-

-		for (Object object : this) {

-			if (this.contains(object)) {

-				E oldObject = doRemove(indexOf(object));

-

-			}

-		}

-	}

-

-	@Override

-	public void notWrappingAdd(E object) {

-		doAddUnique(object);

-	}

-

-	@Override

-	public E notWrappingRemove(E object) {

-		return doRemove(indexOf(object));

-	}

-

-	@Override

-	public void silentAdd(int index, E object) {

-		super.doAddUnique(index, object);

-	}

-

-

-	@Override

-	public E silentRemove(int index) {

-		return super.doRemove(index);

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java
deleted file mode 100644
index a0c48a772bd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-

-

-public interface WrappingList<E extends RepresentingElement> extends EList<E> {

-

-	public void notWrappingAdd(E object);

-

-	public E notWrappingRemove(E object);

-

-	public void silentAdd(int i, E object);

-

-	public E silentRemove(int index);

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java
deleted file mode 100644
index cdf928ba2fc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentEList;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingSubsetEObjectContainmentEList<E extends RepresentingElement> extends WrappingEObjectContainmentEList<E> {

-

-	protected List<WrappingList<E>> representingSuperSets;

-

-	public WrappingSubsetEObjectContainmentEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

-		super(dataClass, owner, featureID, representedElementList);

-		this.representingSuperSets = new ArrayList<WrappingList<E>>();

-		for (int i = 0; i < representingSuperSets.length; i++) {

-			this.representingSuperSets.add(representingSuperSets[i]);

-		}

-	}

-

-	// @Override

-	// public boolean add(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	//

-	// // if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// // }

-	// }

-	//

-	//

-	// return super.add(object);

-	// }

-	//

-	// @Override

-	// public void add(int index, E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.add(index, object);

-	// }

-	//

-	// @Override

-	// public boolean addAll(Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(collection);

-	// }

-	//

-	// @Override

-	// public boolean addAll(int index, Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(index, collection);

-	// }

-	//

-	// @Override

-	// public boolean remove(Object object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove((E)object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(object);

-	// }

-	//

-	// @Override

-	// public E remove(int index) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove(get(index));

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(index);

-	// }

-	//

-	// @Override

-	// public boolean removeAll(Collection<?> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : collection) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// return super.removeAll(collection);

-	// }

-	//

-	// @Override

-	// public void clear() {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : this) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.clear();

-	// }

-	//

-	// @Override

-	// public void notWrappingAdd(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// representingSuperSet.notWrappingAdd(object);

-	// }

-	// }

-	//

-	// doAddUnique(object);

-	// }

-	//

-	// @Override

-	// public E notWrappingRemove(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// representingSuperSet.notWrappingRemove(object);

-	// }

-	//

-	// return doRemove(indexOf(object));

-	// }

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java
deleted file mode 100644
index 29737f1f162..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentWithInverseEList;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingSubsetEObjectContainmentWithInverseEList<E extends RepresentingElement> extends WrappingEObjectContainmentWithInverseEList<E> {

-

-	protected List<WrappingList<E>> representingSuperSets;

-

-	public WrappingSubsetEObjectContainmentWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

-		super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

-		this.representingSuperSets = new ArrayList<WrappingList<E>>();

-		for (int i = 0; i < representingSuperSets.length; i++) {

-			this.representingSuperSets.add(representingSuperSets[i]);

-		}

-	}

-

-	// @Override

-	// public boolean add(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	//

-	// // if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// // }

-	// }

-	//

-	//

-	// return super.add(object);

-	// }

-	//

-	// @Override

-	// public void add(int index, E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.add(index, object);

-	// }

-	//

-	// @Override

-	// public boolean addAll(Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(collection);

-	// }

-	//

-	// @Override

-	// public boolean addAll(int index, Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(index, collection);

-	// }

-	//

-	// @Override

-	// public boolean remove(Object object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove((E)object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(object);

-	// }

-	//

-	// @Override

-	// public E remove(int index) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove(get(index));

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(index);

-	// }

-	//

-	// @Override

-	// public boolean removeAll(Collection<?> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : collection) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// return super.removeAll(collection);

-	// }

-	//

-	// @Override

-	// public void clear() {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : this) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.clear();

-	// }

-	//

-	// @Override

-	// public void notWrappingAdd(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// representingSuperSet.notWrappingAdd(object);

-	// }

-	// }

-	//

-	// doAddUnique(object);

-	// }

-	//

-	// @Override

-	// public E notWrappingRemove(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// representingSuperSet.notWrappingRemove(object);

-	// }

-	//

-	// return doRemove(indexOf(object));

-	// }

-

-

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java
deleted file mode 100644
index ffe44e415a9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingSubsetEObjectEList<E extends RepresentingElement> extends WrappingEObjectEList<E> {

-

-	protected List<WrappingList<E>> representingSuperSets;

-

-

-	public WrappingSubsetEObjectEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

-		super(dataClass, owner, featureID, representedElementList);

-		this.representingSuperSets = new ArrayList<WrappingList<E>>();

-		for (int i = 0; i < representingSuperSets.length; i++) {

-			this.representingSuperSets.add(representingSuperSets[i]);

-		}

-	}

-	//

-	// @Override

-	// public boolean add(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	//

-	// // if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// // }

-	// }

-	//

-	//

-	// return super.add(object);

-	// }

-	//

-	// @Override

-	// public void add(int index, E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.add(index, object);

-	// }

-	//

-	// @Override

-	// public boolean addAll(Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(collection);

-	// }

-	//

-	// @Override

-	// public boolean addAll(int index, Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(index, collection);

-	// }

-	//

-	// @Override

-	// public boolean remove(Object object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove((E)object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(object);

-	// }

-	//

-	// @Override

-	// public E remove(int index) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove(get(index));

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(index);

-	// }

-	//

-	// @Override

-	// public boolean removeAll(Collection<?> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : collection) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// return super.removeAll(collection);

-	// }

-	//

-	// @Override

-	// public void clear() {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : this) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.clear();

-	// }

-	//

-	// @Override

-	// public void notWrappingAdd(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// representingSuperSet.notWrappingAdd(object);

-	// }

-	// }

-	//

-	// super.notWrappingAdd(object);

-	// }

-	//

-	// @Override

-	// public E notWrappingRemove(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// representingSuperSet.notWrappingRemove(object);

-	// }

-	//

-	// return super.notWrappingRemove(object);

-	// }

-	//

-	//

-

-

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java
deleted file mode 100644
index 7bcf508406f..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.papyrus.facade.utils.RepresentingElement;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList;

-import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

-import org.eclipse.uml2.uml.Element;

-

-

-public class WrappingSubsetEObjectWithInverseEList<E extends RepresentingElement> extends WrappingEObjectWithInverseEList<E> {

-

-	public static class WrappingSubsetManyInverse<E> extends WrappingSubsetEObjectWithInverseEList {

-

-		private static final long serialVersionUID = 1L;

-

-		public WrappingSubsetManyInverse(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList... representingSuperSets) {

-			super(dataClass, owner, featureID, inverseFeatureID, representedElementList, representingSuperSets);

-		}

-

-		@Override

-		protected boolean hasManyInverse() {

-			return true;

-		}

-	}

-

-	protected List<WrappingList<E>> representingSuperSets;

-

-	public WrappingSubsetEObjectWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

-		super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

-		this.representingSuperSets = new ArrayList<WrappingList<E>>();

-		for (int i = 0; i < representingSuperSets.length; i++) {

-			this.representingSuperSets.add(representingSuperSets[i]);

-		}

-

-	}

-

-	// @Override

-	// public boolean add(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	//

-	// // if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// // }

-	// }

-	//

-	//

-	// return super.add(object);

-	// }

-	//

-	// @Override

-	// public void add(int index, E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// // representingSuperSet.notWrappingAdd(object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.add(index, object);

-	// }

-	//

-	// @Override

-	// public boolean addAll(Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(collection);

-	// }

-	//

-	// @Override

-	// public boolean addAll(int index, Collection<? extends E> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(E e : collection) {

-	// if(!representingSuperSet.contains(e)) {

-	// // representingSuperSet.notWrappingAdd(e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	// }

-	//

-	// return super.addAll(index, collection);

-	// }

-	//

-	// @Override

-	// public boolean remove(Object object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove((E)object);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(object);

-	// }

-	//

-	// @Override

-	// public E remove(int index) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// // representingSuperSet.notWrappingRemove(get(index));

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	//

-	// return super.remove(index);

-	// }

-	//

-	// @Override

-	// public boolean removeAll(Collection<?> collection) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : collection) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// return super.removeAll(collection);

-	// }

-	//

-	// @Override

-	// public void clear() {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// for(Object e : this) {

-	// // representingSuperSet.notWrappingRemove((E)e);

-	// EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

-	//

-	// Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

-	//

-	// list.getEObject().eNotify(notification);

-	// }

-	// }

-	//

-	// super.clear();

-	// }

-	//

-	// @Override

-	// public void notWrappingAdd(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// if(!representingSuperSet.contains(object)) {

-	// representingSuperSet.notWrappingAdd(object);

-	// }

-	// }

-	//

-	// doAddUnique(object);

-	// }

-	//

-	// @Override

-	// public E notWrappingRemove(E object) {

-	// for(WrappingList representingSuperSet : representingSuperSets) {

-	// representingSuperSet.notWrappingRemove(object);

-	// }

-	//

-	// return doRemove(indexOf(object));

-	// }

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade/.classpath
deleted file mode 100644
index ed2bc1287f0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/.project b/extraplugins/facade/org.eclipse.papyrus.facade/.project
deleted file mode 100644
index 99d20c7e0f0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.facade</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
deleted file mode 100644
index 2cc90f78c72..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.facade,

- org.eclipse.papyrus.facade.extensiondefinition,

- org.eclipse.papyrus.facade.extensiondefinition.impl,

- org.eclipse.papyrus.facade.extensiondefinition.util,

- org.eclipse.papyrus.facade.impl,

- org.eclipse.papyrus.facade.util,

- org.eclipse.papyrus.facade.virtualmetamodel,

- org.eclipse.papyrus.facade.virtualmetamodel.impl,

- org.eclipse.papyrus.facade.virtualmetamodel.util,

- org.eclipse.papyrus.facademapping,

- org.eclipse.papyrus.facademapping.impl,

- org.eclipse.papyrus.facademapping.util

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.uml2.uml;bundle-version="4.1.0",

- org.eclipse.uml2.types;visibility:=reexport,

- org.eclipse.ui;bundle-version="3.105.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0"

-Bundle-Vendor: %vendorName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-Activator: org.eclipse.papyrus.facade.FacadeActivator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.facade;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/about.html b/extraplugins/facade/org.eclipse.papyrus.facade/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>March, 2014</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade/build.properties
deleted file mode 100644
index 127b024480b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               icons/,\

-               about.html,\

-               schema/

-jars.compile.order = .

-source.. = src/

-output.. = bin/

-src.includes = about.html

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png
deleted file mode 100644
index 779a7b8b123..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png
+++ /dev/null
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore
deleted file mode 100644
index c689e44cc4d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="facade" nsURI="http://www.eclipse.org/papyrus/facade" nsPrefix="facade">

-  <eClassifiers xsi:type="ecore:EClass" name="Facade">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinitions" upperBound="-1"

-        eType="#//extensiondefinition/ExtensionDefinition" containment="true" eOpposite="#//extensiondefinition/ExtensionDefinition/facade"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="virtualmetamodel" eType="#//virtualmetamodel/VirtualMetamodel"

-        containment="true" eOpposite="#//virtualmetamodel/VirtualMetamodel/facade"/>

-  </eClassifiers>

-  <eSubpackages name="virtualmetamodel" nsURI="http://www.eclipse.org/papyrus/virtualmetamodel"

-      nsPrefix="virtualmetamodel">

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualMetamodel">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsPrefix" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="virtualClassifiers" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualClassifier" containment="true" eOpposite="#//virtualmetamodel/VirtualClassifier/metamodel"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="facade" lowerBound="1"

-          eType="#//Facade" eOpposite="#//Facade/virtualmetamodel"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualElement" abstract="true">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="aliasName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="kept" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="representedElement" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="useRepresented" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualClassifier" abstract="true"

-        eSuperTypes="#//virtualmetamodel/VirtualElement">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" lowerBound="1"

-          eType="#//virtualmetamodel/VirtualMetamodel" eOpposite="#//virtualmetamodel/VirtualMetamodel/virtualClassifiers"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualMetaclass" eSuperTypes="#//virtualmetamodel/VirtualClassifier">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="appliedStereotypes" upperBound="-1"

-          eType="#//extensiondefinition/BaseMetaclass"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualOperation" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="parents" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualMetaclass"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualProperty" containment="true" eOpposite="#//virtualmetamodel/VirtualProperty/virtualMetaclass"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeInterface"

-          lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualProperty" eSuperTypes="#//virtualmetamodel/VirtualTypedElement">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="virtualMetaclass" lowerBound="1"

-          eType="#//virtualmetamodel/VirtualMetaclass" eOpposite="#//virtualmetamodel/VirtualMetaclass/properties"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualOperation" eSuperTypes="#//virtualmetamodel/VirtualTypedElement">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualParameter" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualParameter" eSuperTypes="#//virtualmetamodel/VirtualTypedElement"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualDatatype" eSuperTypes="#//virtualmetamodel/VirtualClassifier"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualEnum" eSuperTypes="#//virtualmetamodel/VirtualClassifier">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"

-          eType="#//virtualmetamodel/VirtualLiteral" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualLiteral" eSuperTypes="#//virtualmetamodel/VirtualElement"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VirtualTypedElement" abstract="true"

-        eSuperTypes="#//virtualmetamodel/VirtualElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1"

-          eType="#//virtualmetamodel/VirtualClassifier"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="extensiondefinition" nsURI="http://www.eclipse.org/papyrus/extensiondefinition"

-      nsPrefix="extensiondefinition">

-    <eClassifiers xsi:type="ecore:EClass" name="ExtensionDefinition">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="extension" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Extension"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="baseMetaclasses" upperBound="-1"

-          eType="#//extensiondefinition/BaseMetaclass" containment="true" eOpposite="#//extensiondefinition/BaseMetaclass/extensionDefinition"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="facade" lowerBound="1"

-          eType="#//Facade" eOpposite="#//Facade/extensionDefinitions"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" lowerBound="1"

-          eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1"

-          eType="#//extensiondefinition/ExtensionDefinitionKind"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="ExtensionDefinitionKind">

-      <eLiterals name="Association" literal="Association"/>

-      <eLiterals name="Generalization" value="1"/>

-      <eLiterals name="MultiGeneralization" value="2"/>

-      <eLiterals name="Fusion" value="3" literal="Fusion"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="BaseMetaclass">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="incompatibleStereotypes"

-          upperBound="-1" eType="#//extensiondefinition/Combination" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="base" lowerBound="1"

-          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinition"

-          lowerBound="1" eType="#//extensiondefinition/ExtensionDefinition" eOpposite="#//extensiondefinition/ExtensionDefinition/baseMetaclasses"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="compatibleStereotypes"

-          upperBound="-1" eType="#//extensiondefinition/Combination" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="possible" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Combination">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"

-          eType="#//extensiondefinition/BaseMetaclass"/>

-    </eClassifiers>

-  </eSubpackages>

-</ecore:EPackage>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel
deleted file mode 100644
index 7de7c462bfd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.facade/src" modelPluginID="org.eclipse.papyrus.facade"

-    modelName="Facade" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>facade.ecore</foreignModel>

-  <genPackages prefix="Facade" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"

-      ecorePackage="facade.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="facade.ecore#//ExtensionDefinitionKind">

-      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Tag"/>

-      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Metaclass"/>

-      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Fusion"/>

-    </genEnums>

-    <genClasses ecoreClass="facade.ecore#//Facade">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//Facade/facadeConstraints"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//Facade/extensionDefinitions"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/nsPrefix"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/nsURI"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//ExtensionDefinition">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/extension"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/baseMetaclasses"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/facade"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/stereotype"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//ExtensionDefinition/kind"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//BaseMetaclass">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/incompatibleStereotypes"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/base"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/extensionDefinition"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/compatibleStereotypes"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//BaseMetaclass/possible"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//Combination">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//Combination/members"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="facade.ecore#//FacadeConstraint">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//FacadeConstraint/constrainedElement"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//FilterConstraint">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//FilterConstraint/isInclusion"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//AbstractConstraint"/>

-    <genClasses ecoreClass="facade.ecore#//AliasConstraint">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//AliasConstraint/aliasName"/>

-    </genClasses>

-    <genClasses ecoreClass="facade.ecore#//MultiplicityConstraint">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//MultiplicityConstraint/lower"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//MultiplicityConstraint/upper"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore
deleted file mode 100644
index 713432f7619..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="facademapping" nsURI="http://www.eclipse.org/papyrus/facademapping"

-    nsPrefix="facademapping">

-  <eClassifiers xsi:type="ecore:EClass" name="Mapping">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="umlElement" lowerBound="1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="specificDomainElement"

-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StereotypedMapping" eSuperTypes="#//Mapping">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="appliedStereotypes" lowerBound="1"

-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ExtensionDefinitionKind"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FacadeMappping">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappings" upperBound="-1"

-        eType="#//Mapping" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="ExtensionDefinitionKind">

-    <eLiterals name="Association" literal="Association"/>

-    <eLiterals name="Generalization" value="1"/>

-    <eLiterals name="MultiGeneralization" value="2"/>

-    <eLiterals name="Fusion" value="3" literal="Fusion"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel
deleted file mode 100644
index c2af11c0380..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.facade/src" modelPluginID="org.eclipse.papyrus.facade"

-    modelName="Facademapping" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>facademapping.ecore</foreignModel>

-  <genPackages prefix="Facademapping" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"

-      ecorePackage="facademapping.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="facademapping.ecore#//ExtensionDefinitionKind">

-      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Association"/>

-      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Generalization"/>

-      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/MultiGeneralization"/>

-      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Fusion"/>

-    </genEnums>

-    <genClasses ecoreClass="facademapping.ecore#//Mapping">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//Mapping/umlElement"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//Mapping/specificDomainElement"/>

-    </genClasses>

-    <genClasses ecoreClass="facademapping.ecore#//StereotypedMapping">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//StereotypedMapping/appliedStereotypes"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facademapping.ecore#//StereotypedMapping/kind"/>

-    </genClasses>

-    <genClasses ecoreClass="facademapping.ecore#//FacadeMappping">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facademapping.ecore#//FacadeMappping/mappings"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties
deleted file mode 100644
index f67af23f72e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=Papyrus Facade (Incubation)

-vendorName=Eclipse Modeling Project

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml
deleted file mode 100644
index 266a176742a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-   <extension-point id="facadeDefinition" name="facadeDefinition" schema="schema/facadeDefinition.exsd"/>

-

-

-
-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated facade -->

-      <package

-            uri="http://www.eclipse.org/papyrus/facade"

-            class="org.eclipse.papyrus.facade.FacadePackage"

-            genModel="model/facade.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated facade -->

-      <parser

-            type="facade"

-            class="org.eclipse.papyrus.facade.util.FacadeResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated facade -->

-      <package

-            uri="http://www.eclipse.org/papyrus/virtualmetamodel"

-            class="org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage"

-            genModel="model/facade.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated facade -->

-      <parser

-            type="virtualmetamodel"

-            class="org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated facade -->

-      <package

-            uri="http://www.eclipse.org/papyrus/extensiondefinition"

-            class="org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage"

-            genModel="model/facade.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated facade -->

-      <parser

-            type="extensiondefinition"

-            class="org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceFactoryImpl"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated facademapping -->

-      <package

-            uri="http://www.eclipse.org/papyrus/facademapping"

-            class="org.eclipse.papyrus.facademapping.FacademappingPackage"

-            genModel="model/facademapping.genmodel"/>

-   </extension>

-   

-      <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.facade.category"

-            id="org.eclipse.papyrus.facade.applyFacadeCommand"

-            name="Apply a facade">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.facade.handlers.ApplyFacade"

-            commandId="org.eclipse.papyrus.facade.applyFacadeCommand">

-      </handler>

-   </extension>

- 

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">

-            <command

-                  commandId="org.eclipse.papyrus.facade.applyFacadeCommand"

-                  icon="icons/facade.png"

-                  id="org.eclipse.papyrus.facade.menu.applyFacadeCommand">

- 

-                    <visibleWhen>

-				           <with variable="activeMenuSelection">

-				            <iterate

-				                 ifEmpty="false">

-				             <adapt type="org.eclipse.core.resources.IResource">

-

-				             </adapt>

-				            </iterate>

-				           </with>

-         			</visibleWhen>

-            </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/pom.xml b/extraplugins/facade/org.eclipse.papyrus.facade/pom.xml
deleted file mode 100644
index 1e3c0bb3423..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project>

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>

-		<groupId>org.eclipse.papyrus</groupId>

-		<version>3.0.0-SNAPSHOT</version>

-		<relativePath>../../../releng/extra</relativePath>

-	</parent>

-	<artifactId>org.eclipse.papyrus.facade</artifactId>

-	<packaging>eclipse-plugin</packaging>

-	<version>1.2.0-SNAPSHOT</version>

-	<groupId>org.eclipse.papyrus</groupId>

-</project>
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd b/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd
deleted file mode 100644
index c11b1078a7a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.facade" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.facade" id="facadeDefinition" name="facadeDefinition"/>

-      </appInfo>

-      <documentation>

-         Extension point used to define available facade.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="facadeDefinition"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="facadeDefinition">

-      <complexType>

-         <sequence minOccurs="1" maxOccurs="unbounded">

-            <element ref="profileURI"/>

-         </sequence>

-         <attribute name="id" type="string" use="default" value="0">

-            <annotation>

-               <documentation>

-                  The non-negative priority of the scope provider; the default is 0 (zero).  Providers are invoked by the search framework in priority order, from highest to lowest.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="fileExtension" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="profileURI">

-      <complexType>

-         <attribute name="uri" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         1.0.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         &lt;extension point=&quot;org.eclipse.papyrus.facade.facadeDefinition&quot;&gt;

-	&lt;facadeDefinition fileExtension=&quot;umlrtdsl&quot; id=&quot;umlrtdsl&quot;&gt;

-         &lt;profileURI uri=&quot;pathmap://UMLRT_PROFILES/uml-rt.profile.uml&quot;&gt;&lt;/profileURI&gt;

-	&lt;/facadeDefinition&gt;

-&lt;/extension&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2013 CEA LIST and others.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java
deleted file mode 100644
index 464b40973f4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Facade</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.FacadePackage#getFacade()

- * @model

- * @generated

- */

-public interface Facade extends EObject {

-

-	/**

-	 * Returns the value of the '<em><b>Extension Definitions</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Extension Definitions</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Extension Definitions</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.FacadePackage#getFacade_ExtensionDefinitions()

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade

-	 * @model opposite="facade" containment="true"

-	 * @generated

-	 */

-	EList<ExtensionDefinition> getExtensionDefinitions();

-

-	/**

-	 * Returns the value of the '<em><b>Virtualmetamodel</b></em>' containment reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Virtualmetamodel</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Virtualmetamodel</em>' containment reference.

-	 * @see #setVirtualmetamodel(VirtualMetamodel)

-	 * @see org.eclipse.papyrus.facade.FacadePackage#getFacade_Virtualmetamodel()

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade

-	 * @model opposite="facade" containment="true"

-	 * @generated

-	 */

-	VirtualMetamodel getVirtualmetamodel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Virtualmetamodel</em>' containment reference.

-	 * @see #getVirtualmetamodel()

-	 * @generated

-	 */

-	void setVirtualmetamodel(VirtualMetamodel value);

-

-} // Facade

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java
deleted file mode 100644
index f0583d46c38..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-

-public class FacadeActivator extends AbstractUIPlugin {

-

-	/** The context. */

-	private static BundleContext context;

-

-	// The plug-in ID

-	/** The Constant PLUGIN_ID. */

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.facade"; //$NON-NLS-1$

-

-	/** The log. */

-	public static LogHelper log;

-

-	/**

-	 * Gets the context.

-	 *

-	 * @return the context

-	 */

-	static BundleContext getContext() {

-		return context;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 *

-	 * @param bundleContext

-	 * @throws Exception

-	 */

-

-	@Override

-	public void start(BundleContext bundleContext) throws Exception {

-		FacadeActivator.context = bundleContext;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 *

-	 * @param bundleContext

-	 * @throws Exception

-	 */

-

-	@Override

-	public void stop(BundleContext bundleContext) throws Exception {

-		FacadeActivator.context = null;

-	}

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java
deleted file mode 100644
index a43dd41c173..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.FacadePackage

- * @generated

- */

-public interface FacadeFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	FacadeFactory eINSTANCE = org.eclipse.papyrus.facade.impl.FacadeFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Facade</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Facade</em>'.

-	 * @generated

-	 */

-	Facade createFacade();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	FacadePackage getFacadePackage();

-

-} // FacadeFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java
deleted file mode 100644
index 5a9cfb8d997..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.FacadeFactory

- * @model kind="package"

- * @generated

- */

-public interface FacadePackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "facade";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/facade";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "facade";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	FacadePackage eINSTANCE = org.eclipse.papyrus.facade.impl.FacadePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.impl.FacadeImpl <em>Facade</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.impl.FacadeImpl

-	 * @see org.eclipse.papyrus.facade.impl.FacadePackageImpl#getFacade()

-	 * @generated

-	 */

-	int FACADE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Extension Definitions</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE__EXTENSION_DEFINITIONS = 0;

-

-	/**

-	 * The feature id for the '<em><b>Virtualmetamodel</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE__VIRTUALMETAMODEL = 1;

-

-	/**

-	 * The number of structural features of the '<em>Facade</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Facade</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE_OPERATION_COUNT = 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.Facade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Facade</em>'.

-	 * @see org.eclipse.papyrus.facade.Facade

-	 * @generated

-	 */

-	EClass getFacade();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Extension Definitions</em>'.

-	 * @see org.eclipse.papyrus.facade.Facade#getExtensionDefinitions()

-	 * @see #getFacade()

-	 * @generated

-	 */

-	EReference getFacade_ExtensionDefinitions();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Virtualmetamodel</em>'.

-	 * @see org.eclipse.papyrus.facade.Facade#getVirtualmetamodel()

-	 * @see #getFacade()

-	 * @generated

-	 */

-	EReference getFacade_Virtualmetamodel();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	FacadeFactory getFacadeFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.impl.FacadeImpl <em>Facade</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.impl.FacadeImpl

-		 * @see org.eclipse.papyrus.facade.impl.FacadePackageImpl#getFacade()

-		 * @generated

-		 */

-		EClass FACADE = eINSTANCE.getFacade();

-

-		/**

-		 * The meta object literal for the '<em><b>Extension Definitions</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FACADE__EXTENSION_DEFINITIONS = eINSTANCE.getFacade_ExtensionDefinitions();

-

-		/**

-		 * The meta object literal for the '<em><b>Virtualmetamodel</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FACADE__VIRTUALMETAMODEL = eINSTANCE.getFacade_Virtualmetamodel();

-

-	}

-

-} // FacadePackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java
deleted file mode 100644
index 78753b94719..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facade.messages"; //$NON-NLS-1$

-

-	public static String ApplyFacade_0;

-

-	public static String ApplyFacade_1;

-

-	public static String FacadeDefinitionManager_0;

-

-	public static String FacadeDefinitionManager_1;

-

-	public static String FacadeDefinitionManager_10;

-

-	public static String FacadeDefinitionManager_11;

-

-	public static String FacadeDefinitionManager_12;

-

-	public static String FacadeDefinitionManager_13;

-

-	public static String FacadeDefinitionManager_14;

-

-	public static String FacadeDefinitionManager_15;

-

-	public static String FacadeDefinitionManager_16;

-

-	public static String FacadeDefinitionManager_17;

-

-	public static String FacadeDefinitionManager_2;

-

-	public static String FacadeDefinitionManager_3;

-

-	public static String FacadeDefinitionManager_4;

-

-	public static String FacadeDefinitionManager_5;

-

-	public static String FacadeDefinitionManager_6;

-

-	public static String FacadeDefinitionManager_7;

-

-	public static String FacadeDefinitionManager_8;

-

-	public static String FacadeDefinitionManager_9;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java
deleted file mode 100644
index 46de28bd045..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Base Metaclass</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes <em>Compatible Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass()

- * @model

- * @generated

- */

-public interface BaseMetaclass extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Incompatible Stereotypes</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Incompatible Stereotypes</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Incompatible Stereotypes</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_IncompatibleStereotypes()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Combination> getIncompatibleStereotypes();

-

-	/**

-	 * Returns the value of the '<em><b>Base</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Base</em>' reference.

-	 * @see #setBase(EObject)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_Base()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getBase();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Base</em>' reference.

-	 * @see #getBase()

-	 * @generated

-	 */

-	void setBase(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Extension Definition</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Extension Definition</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Extension Definition</em>' container reference.

-	 * @see #setExtensionDefinition(ExtensionDefinition)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_ExtensionDefinition()

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses

-	 * @model opposite="baseMetaclasses" required="true" transient="false"

-	 * @generated

-	 */

-	ExtensionDefinition getExtensionDefinition();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Extension Definition</em>' container reference.

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	void setExtensionDefinition(ExtensionDefinition value);

-

-	/**

-	 * Returns the value of the '<em><b>Compatible Stereotypes</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Compatible Stereotypes</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Compatible Stereotypes</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_CompatibleStereotypes()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Combination> getCompatibleStereotypes();

-

-	/**

-	 * Returns the value of the '<em><b>Possible</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Possible</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Possible</em>' attribute.

-	 * @see #setPossible(boolean)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_Possible()

-	 * @model required="true"

-	 * @generated

-	 */

-	boolean isPossible();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Possible</em>' attribute.

-	 * @see #isPossible()

-	 * @generated

-	 */

-	void setPossible(boolean value);

-

-} // BaseMetaclass

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java
deleted file mode 100644
index e16ee5e2c7b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Combination</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers <em>Members</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getCombination()

- * @model

- * @generated

- */

-public interface Combination extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Members</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Members</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Members</em>' reference list.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getCombination_Members()

-	 * @model

-	 * @generated

-	 */

-	EList<BaseMetaclass> getMembers();

-

-} // Combination

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java
deleted file mode 100644
index 228558e7c46..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Extension Definition</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition()

- * @model

- * @generated

- */

-public interface ExtensionDefinition extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Extension</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Extension</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Extension</em>' reference.

-	 * @see #setExtension(Extension)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Extension()

-	 * @model required="true"

-	 * @generated

-	 */

-	Extension getExtension();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Extension</em>' reference.

-	 * @see #getExtension()

-	 * @generated

-	 */

-	void setExtension(Extension value);

-

-	/**

-	 * Returns the value of the '<em><b>Base Metaclasses</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Base Metaclasses</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Base Metaclasses</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_BaseMetaclasses()

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition

-	 * @model opposite="extensionDefinition" containment="true"

-	 * @generated

-	 */

-	EList<BaseMetaclass> getBaseMetaclasses();

-

-	/**

-	 * Returns the value of the '<em><b>Facade</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Facade</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Facade</em>' container reference.

-	 * @see #setFacade(Facade)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Facade()

-	 * @see org.eclipse.papyrus.facade.Facade#getExtensionDefinitions

-	 * @model opposite="extensionDefinitions" required="true" transient="false"

-	 * @generated

-	 */

-	Facade getFacade();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Facade</em>' container reference.

-	 * @see #getFacade()

-	 * @generated

-	 */

-	void setFacade(Facade value);

-

-	/**

-	 * Returns the value of the '<em><b>Stereotype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stereotype</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stereotype</em>' reference.

-	 * @see #setStereotype(Stereotype)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Stereotype()

-	 * @model required="true"

-	 * @generated

-	 */

-	Stereotype getStereotype();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Stereotype</em>' reference.

-	 * @see #getStereotype()

-	 * @generated

-	 */

-	void setStereotype(Stereotype value);

-

-	/**

-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

-	 * @see #setKind(ExtensionDefinitionKind)

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Kind()

-	 * @model required="true"

-	 * @generated

-	 */

-	ExtensionDefinitionKind getKind();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

-	 * @see #getKind()

-	 * @generated

-	 */

-	void setKind(ExtensionDefinitionKind value);

-

-} // ExtensionDefinition

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java
deleted file mode 100644
index 73283e5405e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Extension Definition Kind</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinitionKind()

- * @model

- * @generated

- */

-public enum ExtensionDefinitionKind implements Enumerator {

-	/**

-	 * The '<em><b>Association</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #ASSOCIATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ASSOCIATION(0, "Association", "Association"),

-

-	/**

-	 * The '<em><b>Generalization</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #GENERALIZATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	GENERALIZATION(1, "Generalization", "Generalization"),

-

-	/**

-	 * The '<em><b>Multi Generalization</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #MULTI_GENERALIZATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MULTI_GENERALIZATION(2, "MultiGeneralization", "MultiGeneralization"),

-

-	/**

-	 * The '<em><b>Fusion</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FUSION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	FUSION(3, "Fusion", "Fusion");

-

-	/**

-	 * The '<em><b>Association</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Association</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #ASSOCIATION

-	 * @model name="Association"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ASSOCIATION_VALUE = 0;

-

-	/**

-	 * The '<em><b>Generalization</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Generalization</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #GENERALIZATION

-	 * @model name="Generalization"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int GENERALIZATION_VALUE = 1;

-

-	/**

-	 * The '<em><b>Multi Generalization</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Multi Generalization</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #MULTI_GENERALIZATION

-	 * @model name="MultiGeneralization"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int MULTI_GENERALIZATION_VALUE = 2;

-

-	/**

-	 * The '<em><b>Fusion</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Fusion</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FUSION

-	 * @model name="Fusion"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int FUSION_VALUE = 3;

-

-	/**

-	 * An array of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final ExtensionDefinitionKind[] VALUES_ARRAY =

-			new ExtensionDefinitionKind[] {

-					ASSOCIATION,

-					GENERALIZATION,

-					MULTI_GENERALIZATION,

-					FUSION,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<ExtensionDefinitionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			ExtensionDefinitionKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			ExtensionDefinitionKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind get(int value) {

-		switch (value) {

-		case ASSOCIATION_VALUE:

-			return ASSOCIATION;

-		case GENERALIZATION_VALUE:

-			return GENERALIZATION;

-		case MULTI_GENERALIZATION_VALUE:

-			return MULTI_GENERALIZATION;

-		case FUSION_VALUE:

-			return FUSION;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private ExtensionDefinitionKind(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-

-} // ExtensionDefinitionKind

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java
deleted file mode 100644
index 898a4148713..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

- * @generated

- */

-public interface ExtensiondefinitionFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ExtensiondefinitionFactory eINSTANCE = org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Extension Definition</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Extension Definition</em>'.

-	 * @generated

-	 */

-	ExtensionDefinition createExtensionDefinition();

-

-	/**

-	 * Returns a new object of class '<em>Base Metaclass</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Base Metaclass</em>'.

-	 * @generated

-	 */

-	BaseMetaclass createBaseMetaclass();

-

-	/**

-	 * Returns a new object of class '<em>Combination</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Combination</em>'.

-	 * @generated

-	 */

-	Combination createCombination();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ExtensiondefinitionPackage getExtensiondefinitionPackage();

-

-} // ExtensiondefinitionFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java
deleted file mode 100644
index a1df8152885..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory

- * @model kind="package"

- * @generated

- */

-public interface ExtensiondefinitionPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "extensiondefinition";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/extensiondefinition";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "extensiondefinition";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ExtensiondefinitionPackage eINSTANCE = org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl <em>Extension Definition</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinition()

-	 * @generated

-	 */

-	int EXTENSION_DEFINITION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Extension</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION__EXTENSION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Metaclasses</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION__BASE_METACLASSES = 1;

-

-	/**

-	 * The feature id for the '<em><b>Facade</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION__FACADE = 2;

-

-	/**

-	 * The feature id for the '<em><b>Stereotype</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION__STEREOTYPE = 3;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION__KIND = 4;

-

-	/**

-	 * The number of structural features of the '<em>Extension Definition</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION_FEATURE_COUNT = 5;

-

-	/**

-	 * The number of operations of the '<em>Extension Definition</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int EXTENSION_DEFINITION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl <em>Base Metaclass</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getBaseMetaclass()

-	 * @generated

-	 */

-	int BASE_METACLASS = 1;

-

-	/**

-	 * The feature id for the '<em><b>Incompatible Stereotypes</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS__INCOMPATIBLE_STEREOTYPES = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS__BASE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Extension Definition</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS__EXTENSION_DEFINITION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Compatible Stereotypes</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS__COMPATIBLE_STEREOTYPES = 3;

-

-	/**

-	 * The feature id for the '<em><b>Possible</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS__POSSIBLE = 4;

-

-	/**

-	 * The number of structural features of the '<em>Base Metaclass</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS_FEATURE_COUNT = 5;

-

-	/**

-	 * The number of operations of the '<em>Base Metaclass</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_METACLASS_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl <em>Combination</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getCombination()

-	 * @generated

-	 */

-	int COMBINATION = 2;

-

-	/**

-	 * The feature id for the '<em><b>Members</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMBINATION__MEMBERS = 0;

-

-	/**

-	 * The number of structural features of the '<em>Combination</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMBINATION_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Combination</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int COMBINATION_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinitionKind()

-	 * @generated

-	 */

-	int EXTENSION_DEFINITION_KIND = 3;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition <em>Extension Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Extension Definition</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition

-	 * @generated

-	 */

-	EClass getExtensionDefinition();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Extension</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension()

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	EReference getExtensionDefinition_Extension();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Base Metaclasses</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses()

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	EReference getExtensionDefinition_BaseMetaclasses();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Facade</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade()

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	EReference getExtensionDefinition_Facade();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Stereotype</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype()

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	EReference getExtensionDefinition_Stereotype();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Kind</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind()

-	 * @see #getExtensionDefinition()

-	 * @generated

-	 */

-	EAttribute getExtensionDefinition_Kind();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass <em>Base Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Base Metaclass</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass

-	 * @generated

-	 */

-	EClass getBaseMetaclass();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Incompatible Stereotypes</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes()

-	 * @see #getBaseMetaclass()

-	 * @generated

-	 */

-	EReference getBaseMetaclass_IncompatibleStereotypes();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Base</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase()

-	 * @see #getBaseMetaclass()

-	 * @generated

-	 */

-	EReference getBaseMetaclass_Base();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Extension Definition</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition()

-	 * @see #getBaseMetaclass()

-	 * @generated

-	 */

-	EReference getBaseMetaclass_ExtensionDefinition();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes <em>Compatible Stereotypes</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Compatible Stereotypes</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes()

-	 * @see #getBaseMetaclass()

-	 * @generated

-	 */

-	EReference getBaseMetaclass_CompatibleStereotypes();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Possible</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible()

-	 * @see #getBaseMetaclass()

-	 * @generated

-	 */

-	EAttribute getBaseMetaclass_Possible();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination <em>Combination</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Combination</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination

-	 * @generated

-	 */

-	EClass getCombination();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers <em>Members</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Members</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers()

-	 * @see #getCombination()

-	 * @generated

-	 */

-	EReference getCombination_Members();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>Extension Definition Kind</em>'.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

-	 * @generated

-	 */

-	EEnum getExtensionDefinitionKind();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	ExtensiondefinitionFactory getExtensiondefinitionFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl <em>Extension Definition</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinition()

-		 * @generated

-		 */

-		EClass EXTENSION_DEFINITION = eINSTANCE.getExtensionDefinition();

-

-		/**

-		 * The meta object literal for the '<em><b>Extension</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXTENSION_DEFINITION__EXTENSION = eINSTANCE.getExtensionDefinition_Extension();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Metaclasses</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXTENSION_DEFINITION__BASE_METACLASSES = eINSTANCE.getExtensionDefinition_BaseMetaclasses();

-

-		/**

-		 * The meta object literal for the '<em><b>Facade</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXTENSION_DEFINITION__FACADE = eINSTANCE.getExtensionDefinition_Facade();

-

-		/**

-		 * The meta object literal for the '<em><b>Stereotype</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference EXTENSION_DEFINITION__STEREOTYPE = eINSTANCE.getExtensionDefinition_Stereotype();

-

-		/**

-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute EXTENSION_DEFINITION__KIND = eINSTANCE.getExtensionDefinition_Kind();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl <em>Base Metaclass</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getBaseMetaclass()

-		 * @generated

-		 */

-		EClass BASE_METACLASS = eINSTANCE.getBaseMetaclass();

-

-		/**

-		 * The meta object literal for the '<em><b>Incompatible Stereotypes</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BASE_METACLASS__INCOMPATIBLE_STEREOTYPES = eINSTANCE.getBaseMetaclass_IncompatibleStereotypes();

-

-		/**

-		 * The meta object literal for the '<em><b>Base</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BASE_METACLASS__BASE = eINSTANCE.getBaseMetaclass_Base();

-

-		/**

-		 * The meta object literal for the '<em><b>Extension Definition</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BASE_METACLASS__EXTENSION_DEFINITION = eINSTANCE.getBaseMetaclass_ExtensionDefinition();

-

-		/**

-		 * The meta object literal for the '<em><b>Compatible Stereotypes</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference BASE_METACLASS__COMPATIBLE_STEREOTYPES = eINSTANCE.getBaseMetaclass_CompatibleStereotypes();

-

-		/**

-		 * The meta object literal for the '<em><b>Possible</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute BASE_METACLASS__POSSIBLE = eINSTANCE.getBaseMetaclass_Possible();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl <em>Combination</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getCombination()

-		 * @generated

-		 */

-		EClass COMBINATION = eINSTANCE.getCombination();

-

-		/**

-		 * The meta object literal for the '<em><b>Members</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference COMBINATION__MEMBERS = eINSTANCE.getCombination_Members();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

-		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinitionKind()

-		 * @generated

-		 */

-		EEnum EXTENSION_DEFINITION_KIND = eINSTANCE.getExtensionDefinitionKind();

-

-	}

-

-} // ExtensiondefinitionPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java
deleted file mode 100644
index 96737ed7c95..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Base Metaclass</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getBase <em>Base</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getExtensionDefinition <em>Extension Definition</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getCompatibleStereotypes <em>Compatible Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#isPossible <em>Possible</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class BaseMetaclassImpl extends MinimalEObjectImpl.Container implements BaseMetaclass {

-	/**

-	 * The cached value of the '{@link #getIncompatibleStereotypes() <em>Incompatible Stereotypes</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getIncompatibleStereotypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Combination> incompatibleStereotypes;

-

-	/**

-	 * The cached value of the '{@link #getBase() <em>Base</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBase()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject base;

-

-	/**

-	 * The cached value of the '{@link #getCompatibleStereotypes() <em>Compatible Stereotypes</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCompatibleStereotypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Combination> compatibleStereotypes;

-

-	/**

-	 * The default value of the '{@link #isPossible() <em>Possible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isPossible()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean POSSIBLE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isPossible() <em>Possible</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isPossible()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean possible = POSSIBLE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected BaseMetaclassImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtensiondefinitionPackage.Literals.BASE_METACLASS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Combination> getIncompatibleStereotypes() {

-		if (incompatibleStereotypes == null) {

-			incompatibleStereotypes = new EObjectContainmentEList<Combination>(Combination.class, this, ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

-		}

-		return incompatibleStereotypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject getBase() {

-		if (base != null && base.eIsProxy()) {

-			InternalEObject oldBase = (InternalEObject) base;

-			base = eResolveProxy(oldBase);

-			if (base != oldBase) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.BASE_METACLASS__BASE, oldBase, base));

-				}

-			}

-		}

-		return base;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetBase() {

-		return base;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setBase(EObject newBase) {

-		EObject oldBase = base;

-		base = newBase;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__BASE, oldBase, base));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensionDefinition getExtensionDefinition() {

-		if (eContainerFeatureID() != ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION) {

-			return null;

-		}

-		return (ExtensionDefinition) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetExtensionDefinition(ExtensionDefinition newExtensionDefinition, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newExtensionDefinition, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setExtensionDefinition(ExtensionDefinition newExtensionDefinition) {

-		if (newExtensionDefinition != eInternalContainer() || (eContainerFeatureID() != ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION && newExtensionDefinition != null)) {

-			if (EcoreUtil.isAncestor(this, newExtensionDefinition)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newExtensionDefinition != null) {

-				msgs = ((InternalEObject) newExtensionDefinition).eInverseAdd(this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensionDefinition.class, msgs);

-			}

-			msgs = basicSetExtensionDefinition(newExtensionDefinition, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION, newExtensionDefinition, newExtensionDefinition));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Combination> getCompatibleStereotypes() {

-		if (compatibleStereotypes == null) {

-			compatibleStereotypes = new EObjectContainmentEList<Combination>(Combination.class, this, ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES);

-		}

-		return compatibleStereotypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isPossible() {

-		return possible;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setPossible(boolean newPossible) {

-		boolean oldPossible = possible;

-		possible = newPossible;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE, oldPossible, possible));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetExtensionDefinition((ExtensionDefinition) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-			return ((InternalEList<?>) getIncompatibleStereotypes()).basicRemove(otherEnd, msgs);

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			return basicSetExtensionDefinition(null, msgs);

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			return ((InternalEList<?>) getCompatibleStereotypes()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			return eInternalContainer().eInverseRemove(this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensionDefinition.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-			return getIncompatibleStereotypes();

-		case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

-			if (resolve) {

-				return getBase();

-			}

-			return basicGetBase();

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			return getExtensionDefinition();

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			return getCompatibleStereotypes();

-		case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

-			return isPossible();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-			getIncompatibleStereotypes().clear();

-			getIncompatibleStereotypes().addAll((Collection<? extends Combination>) newValue);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

-			setBase((EObject) newValue);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			setExtensionDefinition((ExtensionDefinition) newValue);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			getCompatibleStereotypes().clear();

-			getCompatibleStereotypes().addAll((Collection<? extends Combination>) newValue);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

-			setPossible((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-			getIncompatibleStereotypes().clear();

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

-			setBase((EObject) null);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			setExtensionDefinition((ExtensionDefinition) null);

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			getCompatibleStereotypes().clear();

-			return;

-		case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

-			setPossible(POSSIBLE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

-			return incompatibleStereotypes != null && !incompatibleStereotypes.isEmpty();

-		case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

-			return base != null;

-		case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

-			return getExtensionDefinition() != null;

-		case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

-			return compatibleStereotypes != null && !compatibleStereotypes.isEmpty();

-		case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

-			return possible != POSSIBLE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (possible: ");

-		result.append(possible);

-		result.append(')');

-		return result.toString();

-	}

-

-} // BaseMetaclassImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java
deleted file mode 100644
index 9d1cf48b558..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Combination</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl#getMembers <em>Members</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class CombinationImpl extends MinimalEObjectImpl.Container implements Combination {

-	/**

-	 * The cached value of the '{@link #getMembers() <em>Members</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMembers()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseMetaclass> members;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected CombinationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtensiondefinitionPackage.Literals.COMBINATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<BaseMetaclass> getMembers() {

-		if (members == null) {

-			members = new EObjectResolvingEList<BaseMetaclass>(BaseMetaclass.class, this, ExtensiondefinitionPackage.COMBINATION__MEMBERS);

-		}

-		return members;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

-			return getMembers();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

-			getMembers().clear();

-			getMembers().addAll((Collection<? extends BaseMetaclass>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

-			getMembers().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

-			return members != null && !members.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // CombinationImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java
deleted file mode 100644
index f43da2fa43e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Extension Definition</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getExtension <em>Extension</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getBaseMetaclasses <em>Base Metaclasses</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getFacade <em>Facade</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getStereotype <em>Stereotype</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getKind <em>Kind</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ExtensionDefinitionImpl extends MinimalEObjectImpl.Container implements ExtensionDefinition {

-	/**

-	 * The cached value of the '{@link #getExtension() <em>Extension</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExtension()

-	 * @generated

-	 * @ordered

-	 */

-	protected Extension extension;

-

-	/**

-	 * The cached value of the '{@link #getBaseMetaclasses() <em>Base Metaclasses</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getBaseMetaclasses()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseMetaclass> baseMetaclasses;

-

-	/**

-	 * The cached value of the '{@link #getStereotype() <em>Stereotype</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotype()

-	 * @generated

-	 * @ordered

-	 */

-	protected Stereotype stereotype;

-

-	/**

-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKind()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final ExtensionDefinitionKind KIND_EDEFAULT = ExtensionDefinitionKind.ASSOCIATION;

-

-	/**

-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKind()

-	 * @generated

-	 * @ordered

-	 */

-	protected ExtensionDefinitionKind kind = KIND_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensionDefinitionImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Extension getExtension() {

-		if (extension != null && extension.eIsProxy()) {

-			InternalEObject oldExtension = (InternalEObject) extension;

-			extension = (Extension) eResolveProxy(oldExtension);

-			if (extension != oldExtension) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION, oldExtension, extension));

-				}

-			}

-		}

-		return extension;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Extension basicGetExtension() {

-		return extension;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setExtension(Extension newExtension) {

-		Extension oldExtension = extension;

-		extension = newExtension;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION, oldExtension, extension));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<BaseMetaclass> getBaseMetaclasses() {

-		if (baseMetaclasses == null) {

-			baseMetaclasses = new EObjectContainmentWithInverseEList<BaseMetaclass>(BaseMetaclass.class, this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION);

-		}

-		return baseMetaclasses;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Facade getFacade() {

-		if (eContainerFeatureID() != ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE) {

-			return null;

-		}

-		return (Facade) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetFacade(Facade newFacade, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newFacade, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFacade(Facade newFacade) {

-		if (newFacade != eInternalContainer() || (eContainerFeatureID() != ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE && newFacade != null)) {

-			if (EcoreUtil.isAncestor(this, newFacade)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newFacade != null) {

-				msgs = ((InternalEObject) newFacade).eInverseAdd(this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, Facade.class, msgs);

-			}

-			msgs = basicSetFacade(newFacade, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE, newFacade, newFacade));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Stereotype getStereotype() {

-		if (stereotype != null && stereotype.eIsProxy()) {

-			InternalEObject oldStereotype = (InternalEObject) stereotype;

-			stereotype = (Stereotype) eResolveProxy(oldStereotype);

-			if (stereotype != oldStereotype) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE, oldStereotype, stereotype));

-				}

-			}

-		}

-		return stereotype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Stereotype basicGetStereotype() {

-		return stereotype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setStereotype(Stereotype newStereotype) {

-		Stereotype oldStereotype = stereotype;

-		stereotype = newStereotype;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE, oldStereotype, stereotype));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensionDefinitionKind getKind() {

-		return kind;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setKind(ExtensionDefinitionKind newKind) {

-		ExtensionDefinitionKind oldKind = kind;

-		kind = newKind == null ? KIND_EDEFAULT : newKind;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND, oldKind, kind));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getBaseMetaclasses()).basicAdd(otherEnd, msgs);

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetFacade((Facade) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			return ((InternalEList<?>) getBaseMetaclasses()).basicRemove(otherEnd, msgs);

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			return basicSetFacade(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			return eInternalContainer().eInverseRemove(this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, Facade.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

-			if (resolve) {

-				return getExtension();

-			}

-			return basicGetExtension();

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			return getBaseMetaclasses();

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			return getFacade();

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

-			if (resolve) {

-				return getStereotype();

-			}

-			return basicGetStereotype();

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

-			return getKind();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

-			setExtension((Extension) newValue);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			getBaseMetaclasses().clear();

-			getBaseMetaclasses().addAll((Collection<? extends BaseMetaclass>) newValue);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			setFacade((Facade) newValue);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

-			setStereotype((Stereotype) newValue);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

-			setKind((ExtensionDefinitionKind) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

-			setExtension((Extension) null);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			getBaseMetaclasses().clear();

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			setFacade((Facade) null);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

-			setStereotype((Stereotype) null);

-			return;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

-			setKind(KIND_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

-			return extension != null;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

-			return baseMetaclasses != null && !baseMetaclasses.isEmpty();

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

-			return getFacade() != null;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

-			return stereotype != null;

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

-			return kind != KIND_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (kind: ");

-		result.append(kind);

-		result.append(')');

-		return result.toString();

-	}

-

-} // ExtensionDefinitionImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java
deleted file mode 100644
index 01a3b7c3b69..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionFactoryImpl extends EFactoryImpl implements ExtensiondefinitionFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensiondefinitionFactory init() {

-		try {

-			ExtensiondefinitionFactory theExtensiondefinitionFactory = (ExtensiondefinitionFactory) EPackage.Registry.INSTANCE.getEFactory(ExtensiondefinitionPackage.eNS_URI);

-			if (theExtensiondefinitionFactory != null) {

-				return theExtensiondefinitionFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ExtensiondefinitionFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION:

-			return createExtensionDefinition();

-		case ExtensiondefinitionPackage.BASE_METACLASS:

-			return createBaseMetaclass();

-		case ExtensiondefinitionPackage.COMBINATION:

-			return createCombination();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION_KIND:

-			return createExtensionDefinitionKindFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION_KIND:

-			return convertExtensionDefinitionKindToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensionDefinition createExtensionDefinition() {

-		ExtensionDefinitionImpl extensionDefinition = new ExtensionDefinitionImpl();

-		return extensionDefinition;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public BaseMetaclass createBaseMetaclass() {

-		BaseMetaclassImpl baseMetaclass = new BaseMetaclassImpl();

-		return baseMetaclass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Combination createCombination() {

-		CombinationImpl combination = new CombinationImpl();

-		return combination;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensionDefinitionKind createExtensionDefinitionKindFromString(EDataType eDataType, String initialValue) {

-		ExtensionDefinitionKind result = ExtensionDefinitionKind.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertExtensionDefinitionKindToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensiondefinitionPackage getExtensiondefinitionPackage() {

-		return (ExtensiondefinitionPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ExtensiondefinitionPackage getPackage() {

-		return ExtensiondefinitionPackage.eINSTANCE;

-	}

-

-} // ExtensiondefinitionFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java
deleted file mode 100644
index e4c30b386ca..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.impl.FacadePackageImpl;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionPackageImpl extends EPackageImpl implements ExtensiondefinitionPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass extensionDefinitionEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass baseMetaclassEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass combinationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum extensionDefinitionKindEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ExtensiondefinitionPackageImpl() {

-		super(eNS_URI, ExtensiondefinitionFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link ExtensiondefinitionPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static ExtensiondefinitionPackage init() {

-		if (isInited) {

-			return (ExtensiondefinitionPackage) EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)

-				: new ExtensiondefinitionPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		UMLPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		FacadePackageImpl theFacadePackage = (FacadePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) : FacadePackage.eINSTANCE);

-		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(VirtualmetamodelPackage.eNS_URI) : VirtualmetamodelPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theExtensiondefinitionPackage.createPackageContents();

-		theFacadePackage.createPackageContents();

-		theVirtualmetamodelPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theExtensiondefinitionPackage.initializePackageContents();

-		theFacadePackage.initializePackageContents();

-		theVirtualmetamodelPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theExtensiondefinitionPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ExtensiondefinitionPackage.eNS_URI, theExtensiondefinitionPackage);

-		return theExtensiondefinitionPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getExtensionDefinition() {

-		return extensionDefinitionEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExtensionDefinition_Extension() {

-		return (EReference) extensionDefinitionEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExtensionDefinition_BaseMetaclasses() {

-		return (EReference) extensionDefinitionEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExtensionDefinition_Facade() {

-		return (EReference) extensionDefinitionEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getExtensionDefinition_Stereotype() {

-		return (EReference) extensionDefinitionEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getExtensionDefinition_Kind() {

-		return (EAttribute) extensionDefinitionEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getBaseMetaclass() {

-		return baseMetaclassEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getBaseMetaclass_IncompatibleStereotypes() {

-		return (EReference) baseMetaclassEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getBaseMetaclass_Base() {

-		return (EReference) baseMetaclassEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getBaseMetaclass_ExtensionDefinition() {

-		return (EReference) baseMetaclassEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getBaseMetaclass_CompatibleStereotypes() {

-		return (EReference) baseMetaclassEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getBaseMetaclass_Possible() {

-		return (EAttribute) baseMetaclassEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getCombination() {

-		return combinationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getCombination_Members() {

-		return (EReference) combinationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EEnum getExtensionDefinitionKind() {

-		return extensionDefinitionKindEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensiondefinitionFactory getExtensiondefinitionFactory() {

-		return (ExtensiondefinitionFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		extensionDefinitionEClass = createEClass(EXTENSION_DEFINITION);

-		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__EXTENSION);

-		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__BASE_METACLASSES);

-		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__FACADE);

-		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__STEREOTYPE);

-		createEAttribute(extensionDefinitionEClass, EXTENSION_DEFINITION__KIND);

-

-		baseMetaclassEClass = createEClass(BASE_METACLASS);

-		createEReference(baseMetaclassEClass, BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

-		createEReference(baseMetaclassEClass, BASE_METACLASS__BASE);

-		createEReference(baseMetaclassEClass, BASE_METACLASS__EXTENSION_DEFINITION);

-		createEReference(baseMetaclassEClass, BASE_METACLASS__COMPATIBLE_STEREOTYPES);

-		createEAttribute(baseMetaclassEClass, BASE_METACLASS__POSSIBLE);

-

-		combinationEClass = createEClass(COMBINATION);

-		createEReference(combinationEClass, COMBINATION__MEMBERS);

-

-		// Create enums

-		extensionDefinitionKindEEnum = createEEnum(EXTENSION_DEFINITION_KIND);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		FacadePackage theFacadePackage = (FacadePackage) EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(extensionDefinitionEClass, ExtensionDefinition.class, "ExtensionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getExtensionDefinition_Extension(), theUMLPackage.getExtension(), null, "extension", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getExtensionDefinition_BaseMetaclasses(), this.getBaseMetaclass(), this.getBaseMetaclass_ExtensionDefinition(), "baseMetaclasses", null, 0, -1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getExtensionDefinition_Facade(), theFacadePackage.getFacade(), theFacadePackage.getFacade_ExtensionDefinitions(), "facade", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getExtensionDefinition_Stereotype(), theUMLPackage.getStereotype(), null, "stereotype", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEAttribute(getExtensionDefinition_Kind(), this.getExtensionDefinitionKind(), "kind", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(baseMetaclassEClass, BaseMetaclass.class, "BaseMetaclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getBaseMetaclass_IncompatibleStereotypes(), this.getCombination(), null, "incompatibleStereotypes", null, 0, -1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getBaseMetaclass_Base(), ecorePackage.getEObject(), null, "base", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getBaseMetaclass_ExtensionDefinition(), this.getExtensionDefinition(), this.getExtensionDefinition_BaseMetaclasses(), "extensionDefinition", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getBaseMetaclass_CompatibleStereotypes(), this.getCombination(), null, "compatibleStereotypes", null, 0, -1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBaseMetaclass_Possible(), ecorePackage.getEBoolean(), "possible", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(combinationEClass, Combination.class, "Combination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCombination_Members(), this.getBaseMetaclass(), null, "members", null, 0, -1, Combination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Initialize enums and add enum literals

-		initEEnum(extensionDefinitionKindEEnum, ExtensionDefinitionKind.class, "ExtensionDefinitionKind");

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.ASSOCIATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.GENERALIZATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.MULTI_GENERALIZATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.FUSION);

-	}

-

-} // ExtensiondefinitionPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java
deleted file mode 100644
index daae8af416a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

- * @generated

- */

-public class ExtensiondefinitionAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ExtensiondefinitionPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ExtensiondefinitionPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ExtensiondefinitionSwitch<Adapter> modelSwitch =

-			new ExtensiondefinitionSwitch<Adapter>() {

-				@Override

-				public Adapter caseExtensionDefinition(ExtensionDefinition object) {

-					return createExtensionDefinitionAdapter();

-				}

-

-				@Override

-				public Adapter caseBaseMetaclass(BaseMetaclass object) {

-					return createBaseMetaclassAdapter();

-				}

-

-				@Override

-				public Adapter caseCombination(Combination object) {

-					return createCombinationAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition <em>Extension Definition</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition

-	 * @generated

-	 */

-	public Adapter createExtensionDefinitionAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass <em>Base Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass

-	 * @generated

-	 */

-	public Adapter createBaseMetaclassAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination <em>Combination</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination

-	 * @generated

-	 */

-	public Adapter createCombinationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // ExtensiondefinitionAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java
deleted file mode 100644
index 1586f4e5508..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceImpl

- * @generated

- */

-public class ExtensiondefinitionResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ExtensiondefinitionResourceImpl(uri);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

-		return result;

-	}

-

-} // ExtensiondefinitionResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java
deleted file mode 100644
index 3cd8086a202..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceFactoryImpl

- * @generated

- */

-public class ExtensiondefinitionResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ExtensiondefinitionResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // ExtensiondefinitionResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java
deleted file mode 100644
index f78edea8305..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

- * @generated

- */

-public class ExtensiondefinitionSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ExtensiondefinitionPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ExtensiondefinitionPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case ExtensiondefinitionPackage.EXTENSION_DEFINITION: {

-			ExtensionDefinition extensionDefinition = (ExtensionDefinition) theEObject;

-			T result = caseExtensionDefinition(extensionDefinition);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtensiondefinitionPackage.BASE_METACLASS: {

-			BaseMetaclass baseMetaclass = (BaseMetaclass) theEObject;

-			T result = caseBaseMetaclass(baseMetaclass);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ExtensiondefinitionPackage.COMBINATION: {

-			Combination combination = (Combination) theEObject;

-			T result = caseCombination(combination);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Extension Definition</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Extension Definition</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseExtensionDefinition(ExtensionDefinition object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Base Metaclass</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Base Metaclass</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBaseMetaclass(BaseMetaclass object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Combination</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Combination</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseCombination(Combination object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // ExtensiondefinitionSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java
deleted file mode 100644
index c8ef9aaad50..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ExtensiondefinitionXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensiondefinitionXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ExtensiondefinitionPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ExtensiondefinitionResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new ExtensiondefinitionResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ExtensiondefinitionResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // ExtensiondefinitionXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java
deleted file mode 100644
index 20e0296faca..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.extensiondefinition.Combination;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface BaseMetaclassValidator {

-	boolean validate();

-

-	boolean validateIncompatibleStereotypes(EList<Combination> value);

-

-	boolean validateBase(EObject value);

-

-	boolean validateExtensionDefinition(ExtensionDefinition value);

-

-	boolean validateCompatibleStereotypes(EList<Combination> value);

-

-	boolean validatePossible(boolean value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java
deleted file mode 100644
index af07c01c6ad..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface CombinationValidator {

-	boolean validate();

-

-	boolean validateMembers(EList<BaseMetaclass> value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java
deleted file mode 100644
index d9f238eaedf..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.extensiondefinition.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

-import org.eclipse.uml2.uml.Extension;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface ExtensionDefinitionValidator {

-	boolean validate();

-

-	boolean validateExtension(Extension value);

-

-	boolean validateBaseMetaclasses(EList<BaseMetaclass> value);

-

-	boolean validateFacade(Facade value);

-

-	boolean validateStereotype(Stereotype value);

-

-	boolean validateKind(ExtensionDefinitionKind value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java
deleted file mode 100644
index 3c26befbc40..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadeFactory;

-import org.eclipse.papyrus.facade.FacadePackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeFactoryImpl extends EFactoryImpl implements FacadeFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static FacadeFactory init() {

-		try {

-			FacadeFactory theFacadeFactory = (FacadeFactory) EPackage.Registry.INSTANCE.getEFactory(FacadePackage.eNS_URI);

-			if (theFacadeFactory != null) {

-				return theFacadeFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new FacadeFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case FacadePackage.FACADE:

-			return createFacade();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Facade createFacade() {

-		FacadeImpl facade = new FacadeImpl();

-		return facade;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FacadePackage getFacadePackage() {

-		return (FacadePackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static FacadePackage getPackage() {

-		return FacadePackage.eINSTANCE;

-	}

-

-} // FacadeFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java
deleted file mode 100644
index 1cae1e7402e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Facade</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.impl.FacadeImpl#getExtensionDefinitions <em>Extension Definitions</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.impl.FacadeImpl#getVirtualmetamodel <em>Virtualmetamodel</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FacadeImpl extends MinimalEObjectImpl.Container implements Facade {

-	/**

-	 * The cached value of the '{@link #getExtensionDefinitions() <em>Extension Definitions</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getExtensionDefinitions()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ExtensionDefinition> extensionDefinitions;

-

-	/**

-	 * The cached value of the '{@link #getVirtualmetamodel() <em>Virtualmetamodel</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getVirtualmetamodel()

-	 * @generated

-	 * @ordered

-	 */

-	protected VirtualMetamodel virtualmetamodel;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return FacadePackage.Literals.FACADE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<ExtensionDefinition> getExtensionDefinitions() {

-		if (extensionDefinitions == null) {

-			extensionDefinitions = new EObjectContainmentWithInverseEList<ExtensionDefinition>(ExtensionDefinition.class, this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE);

-		}

-		return extensionDefinitions;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualMetamodel getVirtualmetamodel() {

-		return virtualmetamodel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetVirtualmetamodel(VirtualMetamodel newVirtualmetamodel, NotificationChain msgs) {

-		VirtualMetamodel oldVirtualmetamodel = virtualmetamodel;

-		virtualmetamodel = newVirtualmetamodel;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FacadePackage.FACADE__VIRTUALMETAMODEL, oldVirtualmetamodel, newVirtualmetamodel);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setVirtualmetamodel(VirtualMetamodel newVirtualmetamodel) {

-		if (newVirtualmetamodel != virtualmetamodel) {

-			NotificationChain msgs = null;

-			if (virtualmetamodel != null) {

-				msgs = ((InternalEObject) virtualmetamodel).eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, VirtualMetamodel.class, msgs);

-			}

-			if (newVirtualmetamodel != null) {

-				msgs = ((InternalEObject) newVirtualmetamodel).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, VirtualMetamodel.class, msgs);

-			}

-			msgs = basicSetVirtualmetamodel(newVirtualmetamodel, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, FacadePackage.FACADE__VIRTUALMETAMODEL, newVirtualmetamodel, newVirtualmetamodel));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getExtensionDefinitions()).basicAdd(otherEnd, msgs);

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			if (virtualmetamodel != null) {

-				msgs = ((InternalEObject) virtualmetamodel).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FacadePackage.FACADE__VIRTUALMETAMODEL, null, msgs);

-			}

-			return basicSetVirtualmetamodel((VirtualMetamodel) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			return ((InternalEList<?>) getExtensionDefinitions()).basicRemove(otherEnd, msgs);

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			return basicSetVirtualmetamodel(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			return getExtensionDefinitions();

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			return getVirtualmetamodel();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			getExtensionDefinitions().clear();

-			getExtensionDefinitions().addAll((Collection<? extends ExtensionDefinition>) newValue);

-			return;

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			setVirtualmetamodel((VirtualMetamodel) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			getExtensionDefinitions().clear();

-			return;

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			setVirtualmetamodel((VirtualMetamodel) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

-			return extensionDefinitions != null && !extensionDefinitions.isEmpty();

-		case FacadePackage.FACADE__VIRTUALMETAMODEL:

-			return virtualmetamodel != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // FacadeImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java
deleted file mode 100644
index 60bea55b8ca..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadeFactory;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadePackageImpl extends EPackageImpl implements FacadePackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass facadeEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.facade.FacadePackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private FacadePackageImpl() {

-		super(eNS_URI, FacadeFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link FacadePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static FacadePackage init() {

-		if (isInited) {

-			return (FacadePackage) EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		FacadePackageImpl theFacadePackage = (FacadePackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FacadePackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		UMLPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(VirtualmetamodelPackage.eNS_URI) : VirtualmetamodelPackage.eINSTANCE);

-		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ExtensiondefinitionPackage.eNS_URI) : ExtensiondefinitionPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theFacadePackage.createPackageContents();

-		theVirtualmetamodelPackage.createPackageContents();

-		theExtensiondefinitionPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theFacadePackage.initializePackageContents();

-		theVirtualmetamodelPackage.initializePackageContents();

-		theExtensiondefinitionPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theFacadePackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(FacadePackage.eNS_URI, theFacadePackage);

-		return theFacadePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFacade() {

-		return facadeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFacade_ExtensionDefinitions() {

-		return (EReference) facadeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFacade_Virtualmetamodel() {

-		return (EReference) facadeEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FacadeFactory getFacadeFactory() {

-		return (FacadeFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		facadeEClass = createEClass(FACADE);

-		createEReference(facadeEClass, FACADE__EXTENSION_DEFINITIONS);

-		createEReference(facadeEClass, FACADE__VIRTUALMETAMODEL);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		VirtualmetamodelPackage theVirtualmetamodelPackage = (VirtualmetamodelPackage) EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI);

-		ExtensiondefinitionPackage theExtensiondefinitionPackage = (ExtensiondefinitionPackage) EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

-

-		// Add subpackages

-		getESubpackages().add(theVirtualmetamodelPackage);

-		getESubpackages().add(theExtensiondefinitionPackage);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(facadeEClass, Facade.class, "Facade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFacade_ExtensionDefinitions(), theExtensiondefinitionPackage.getExtensionDefinition(), theExtensiondefinitionPackage.getExtensionDefinition_Facade(), "extensionDefinitions", null, 0, -1, Facade.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getFacade_Virtualmetamodel(), theVirtualmetamodelPackage.getVirtualMetamodel(), theVirtualmetamodelPackage.getVirtualMetamodel_Facade(), "virtualmetamodel", null, 0, 1, Facade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // FacadePackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties
deleted file mode 100644
index fe99cdc6e98..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-ApplyFacade_0=Select the facade

-ApplyFacade_1=Select the facade to apply : 

-FacadeDefinitionManager_0=The plug-in

-FacadeDefinitionManager_1=\ contributed an invalid extension for 

-FacadeDefinitionManager_10=. The facadeDefinition

-FacadeDefinitionManager_11=must be set. 

-FacadeDefinitionManager_12=The plug-in

-FacadeDefinitionManager_13=\ contributed an invalid extension for 

-FacadeDefinitionManager_14=. The facadeDefinition

-FacadeDefinitionManager_15=must be set. 

-FacadeDefinitionManager_16=The facade ID 

-FacadeDefinitionManager_17=\ is already contributed. 

-FacadeDefinitionManager_2=. The facadeDefinition

-FacadeDefinitionManager_3=must be set. 

-FacadeDefinitionManager_4=The plug-in

-FacadeDefinitionManager_5=\ contributed an invalid extension for 

-FacadeDefinitionManager_6=. The facadeDefinition

-FacadeDefinitionManager_7=must be set. 

-FacadeDefinitionManager_8=The plug-in

-FacadeDefinitionManager_9=\ contributed an invalid extension for 

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java
deleted file mode 100644
index a1509237792..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.FacadePackage

- * @generated

- */

-public class FacadeAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static FacadePackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = FacadePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeSwitch<Adapter> modelSwitch =

-			new FacadeSwitch<Adapter>() {

-				@Override

-				public Adapter caseFacade(Facade object) {

-					return createFacadeAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.Facade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.Facade

-	 * @generated

-	 */

-	public Adapter createFacadeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // FacadeAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java
deleted file mode 100644
index d274de4b012..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.util.FacadeResourceImpl

- * @generated

- */

-public class FacadeResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new FacadeResourceImpl(uri);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

-		return result;

-	}

-

-} // FacadeResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java
deleted file mode 100644
index e40b21772f1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.util.FacadeResourceFactoryImpl

- * @generated

- */

-public class FacadeResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public FacadeResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // FacadeResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java
deleted file mode 100644
index c8884678a5c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.FacadePackage

- * @generated

- */

-public class FacadeSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static FacadePackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeSwitch() {

-		if (modelPackage == null) {

-			modelPackage = FacadePackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case FacadePackage.FACADE: {

-			Facade facade = (Facade) theEObject;

-			T result = caseFacade(facade);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Facade</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Facade</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFacade(Facade object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // FacadeSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java
deleted file mode 100644
index b63dc8a98a7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.facade.FacadePackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacadeXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacadeXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		FacadePackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the FacadeResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new FacadeResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new FacadeResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // FacadeXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java
deleted file mode 100644
index 96443c565e6..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.Facade}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface FacadeValidator {

-	boolean validate();

-

-	boolean validateExtensionDefinitions(EList<ExtensionDefinition> value);

-

-	boolean validateVirtualmetamodel(VirtualMetamodel value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java
deleted file mode 100644
index a56298b0d6c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Classifier</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualClassifier()

- * @model abstract="true"

- * @generated

- */

-public interface VirtualClassifier extends VirtualElement {

-	/**

-	 * Returns the value of the '<em><b>Metamodel</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Metamodel</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Metamodel</em>' container reference.

-	 * @see #setMetamodel(VirtualMetamodel)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualClassifier_Metamodel()

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers

-	 * @model opposite="virtualClassifiers" required="true" transient="false"

-	 * @generated

-	 */

-	VirtualMetamodel getMetamodel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Metamodel</em>' container reference.

-	 * @see #getMetamodel()

-	 * @generated

-	 */

-	void setMetamodel(VirtualMetamodel value);

-

-} // VirtualClassifier

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java
deleted file mode 100644
index 66aa0b77b68..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Datatype</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualDatatype()

- * @model

- * @generated

- */

-public interface VirtualDatatype extends VirtualClassifier {

-} // VirtualDatatype

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java
deleted file mode 100644
index acb7566c62b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement()

- * @model abstract="true"

- * @generated

- */

-public interface VirtualElement extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Alias Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Alias Name</em>' attribute.

-	 * @see #setAliasName(String)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_AliasName()

-	 * @model

-	 * @generated

-	 */

-	String getAliasName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Alias Name</em>' attribute.

-	 * @see #getAliasName()

-	 * @generated

-	 */

-	void setAliasName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Kept</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Kept</em>' attribute.

-	 * @see #setKept(boolean)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_Kept()

-	 * @model required="true"

-	 * @generated

-	 */

-	boolean isKept();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kept</em>' attribute.

-	 * @see #isKept()

-	 * @generated

-	 */

-	void setKept(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Represented Element</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Represented Element</em>' reference.

-	 * @see #setRepresentedElement(EObject)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_RepresentedElement()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getRepresentedElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Represented Element</em>' reference.

-	 * @see #getRepresentedElement()

-	 * @generated

-	 */

-	void setRepresentedElement(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Use Represented</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Use Represented</em>' attribute.

-	 * @see #setUseRepresented(boolean)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_UseRepresented()

-	 * @model required="true"

-	 * @generated

-	 */

-	boolean isUseRepresented();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Use Represented</em>' attribute.

-	 * @see #isUseRepresented()

-	 * @generated

-	 */

-	void setUseRepresented(boolean value);

-

-} // VirtualElement

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java
deleted file mode 100644
index 58e682505d5..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Enum</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals <em>Literals</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualEnum()

- * @model

- * @generated

- */

-public interface VirtualEnum extends VirtualClassifier {

-	/**

-	 * Returns the value of the '<em><b>Literals</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Literals</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Literals</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualEnum_Literals()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<VirtualLiteral> getLiterals();

-

-} // VirtualEnum

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java
deleted file mode 100644
index e045e4d42be..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Literal</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualLiteral()

- * @model

- * @generated

- */

-public interface VirtualLiteral extends VirtualElement {

-} // VirtualLiteral

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java
deleted file mode 100644
index a01cefd2a85..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Metaclass</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations <em>Operations</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents <em>Parents</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass()

- * @model

- * @generated

- */

-public interface VirtualMetaclass extends VirtualClassifier {

-	/**

-	 * Returns the value of the '<em><b>Abstract</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Abstract</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Abstract</em>' attribute.

-	 * @see #setAbstract(boolean)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Abstract()

-	 * @model

-	 * @generated

-	 */

-	boolean isAbstract();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Abstract</em>' attribute.

-	 * @see #isAbstract()

-	 * @generated

-	 */

-	void setAbstract(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Applied Stereotypes</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Applied Stereotypes</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Applied Stereotypes</em>' reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_AppliedStereotypes()

-	 * @model

-	 * @generated

-	 */

-	EList<BaseMetaclass> getAppliedStereotypes();

-

-	/**

-	 * Returns the value of the '<em><b>Operations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Operations</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Operations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Operations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<VirtualOperation> getOperations();

-

-	/**

-	 * Returns the value of the '<em><b>Parents</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Parents</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Parents</em>' reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Parents()

-	 * @model

-	 * @generated

-	 */

-	EList<VirtualMetaclass> getParents();

-

-	/**

-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Properties</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Properties()

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass

-	 * @model opposite="virtualMetaclass" containment="true"

-	 * @generated

-	 */

-	EList<VirtualProperty> getProperties();

-

-	/**

-	 * Returns the value of the '<em><b>Stereotype Interface</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stereotype Interface</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stereotype Interface</em>' attribute.

-	 * @see #setStereotypeInterface(boolean)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_StereotypeInterface()

-	 * @model dataType="org.eclipse.uml2.types.Boolean" required="true"

-	 * @generated

-	 */

-	boolean isStereotypeInterface();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Stereotype Interface</em>' attribute.

-	 * @see #isStereotypeInterface()

-	 * @generated

-	 */

-	void setStereotypeInterface(boolean value);

-

-} // VirtualMetaclass

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java
deleted file mode 100644
index 322d8346c43..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.Facade;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Metamodel</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel()

- * @model

- * @generated

- */

-public interface VirtualMetamodel extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_Name()

-	 * @model

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Ns Prefix</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Ns Prefix</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Ns Prefix</em>' attribute.

-	 * @see #setNsPrefix(String)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_NsPrefix()

-	 * @model

-	 * @generated

-	 */

-	String getNsPrefix();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Ns Prefix</em>' attribute.

-	 * @see #getNsPrefix()

-	 * @generated

-	 */

-	void setNsPrefix(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Ns URI</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Ns URI</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Ns URI</em>' attribute.

-	 * @see #setNsURI(String)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_NsURI()

-	 * @model

-	 * @generated

-	 */

-	String getNsURI();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Ns URI</em>' attribute.

-	 * @see #getNsURI()

-	 * @generated

-	 */

-	void setNsURI(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Virtual Classifiers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Virtual Classifiers</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Virtual Classifiers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_VirtualClassifiers()

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel

-	 * @model opposite="metamodel" containment="true"

-	 * @generated

-	 */

-	EList<VirtualClassifier> getVirtualClassifiers();

-

-	/**

-	 * Returns the value of the '<em><b>Facade</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Facade</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Facade</em>' container reference.

-	 * @see #setFacade(Facade)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_Facade()

-	 * @see org.eclipse.papyrus.facade.Facade#getVirtualmetamodel

-	 * @model opposite="virtualmetamodel" required="true" transient="false"

-	 * @generated

-	 */

-	Facade getFacade();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Facade</em>' container reference.

-	 * @see #getFacade()

-	 * @generated

-	 */

-	void setFacade(Facade value);

-

-} // VirtualMetamodel

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java
deleted file mode 100644
index d628fc2abae..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Operation</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters <em>Parameters</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualOperation()

- * @model

- * @generated

- */

-public interface VirtualOperation extends VirtualTypedElement {

-	/**

-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Parameters</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualOperation_Parameters()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<VirtualParameter> getParameters();

-

-} // VirtualOperation

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java
deleted file mode 100644
index aa96bb896c4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Parameter</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualParameter()

- * @model

- * @generated

- */

-public interface VirtualParameter extends VirtualTypedElement {

-} // VirtualParameter

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java
deleted file mode 100644
index 9357852e40b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Property</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualProperty()

- * @model

- * @generated

- */

-public interface VirtualProperty extends VirtualTypedElement {

-	/**

-	 * Returns the value of the '<em><b>Virtual Metaclass</b></em>' container reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Virtual Metaclass</em>' container reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Virtual Metaclass</em>' container reference.

-	 * @see #setVirtualMetaclass(VirtualMetaclass)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualProperty_VirtualMetaclass()

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties

-	 * @model opposite="properties" required="true" transient="false"

-	 * @generated

-	 */

-	VirtualMetaclass getVirtualMetaclass();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Virtual Metaclass</em>' container reference.

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	void setVirtualMetaclass(VirtualMetaclass value);

-

-} // VirtualProperty

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java
deleted file mode 100644
index 31335868560..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Virtual Typed Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement()

- * @model abstract="true"

- * @generated

- */

-public interface VirtualTypedElement extends VirtualElement {

-	/**

-	 * Returns the value of the '<em><b>Lower</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Lower</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Lower</em>' attribute.

-	 * @see #setLower(int)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Lower()

-	 * @model required="true"

-	 * @generated

-	 */

-	int getLower();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Lower</em>' attribute.

-	 * @see #getLower()

-	 * @generated

-	 */

-	void setLower(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Upper</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Upper</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Upper</em>' attribute.

-	 * @see #setUpper(int)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Upper()

-	 * @model required="true"

-	 * @generated

-	 */

-	int getUpper();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Upper</em>' attribute.

-	 * @see #getUpper()

-	 * @generated

-	 */

-	void setUpper(int value);

-

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Type</em>' reference.

-	 * @see #setType(VirtualClassifier)

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Type()

-	 * @model required="true"

-	 * @generated

-	 */

-	VirtualClassifier getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Type</em>' reference.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(VirtualClassifier value);

-

-} // VirtualTypedElement

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java
deleted file mode 100644
index 3a8cee7cfcd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

- * @generated

- */

-public interface VirtualmetamodelFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	VirtualmetamodelFactory eINSTANCE = org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Metamodel</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Metamodel</em>'.

-	 * @generated

-	 */

-	VirtualMetamodel createVirtualMetamodel();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Metaclass</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Metaclass</em>'.

-	 * @generated

-	 */

-	VirtualMetaclass createVirtualMetaclass();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Property</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Property</em>'.

-	 * @generated

-	 */

-	VirtualProperty createVirtualProperty();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Operation</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Operation</em>'.

-	 * @generated

-	 */

-	VirtualOperation createVirtualOperation();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Parameter</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Parameter</em>'.

-	 * @generated

-	 */

-	VirtualParameter createVirtualParameter();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Datatype</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Datatype</em>'.

-	 * @generated

-	 */

-	VirtualDatatype createVirtualDatatype();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Enum</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Enum</em>'.

-	 * @generated

-	 */

-	VirtualEnum createVirtualEnum();

-

-	/**

-	 * Returns a new object of class '<em>Virtual Literal</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Virtual Literal</em>'.

-	 * @generated

-	 */

-	VirtualLiteral createVirtualLiteral();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	VirtualmetamodelPackage getVirtualmetamodelPackage();

-

-} // VirtualmetamodelFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java
deleted file mode 100644
index 514d3c14de0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java
+++ /dev/null
@@ -1,1848 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory

- * @model kind="package"

- * @generated

- */

-public interface VirtualmetamodelPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "virtualmetamodel";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/virtualmetamodel";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "virtualmetamodel";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	VirtualmetamodelPackage eINSTANCE = org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl <em>Virtual Metamodel</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetamodel()

-	 * @generated

-	 */

-	int VIRTUAL_METAMODEL = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL__NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL__NS_PREFIX = 1;

-

-	/**

-	 * The feature id for the '<em><b>Ns URI</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL__NS_URI = 2;

-

-	/**

-	 * The feature id for the '<em><b>Virtual Classifiers</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS = 3;

-

-	/**

-	 * The feature id for the '<em><b>Facade</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL__FACADE = 4;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Metamodel</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL_FEATURE_COUNT = 5;

-

-	/**

-	 * The number of operations of the '<em>Virtual Metamodel</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METAMODEL_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl <em>Virtual Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualElement()

-	 * @generated

-	 */

-	int VIRTUAL_ELEMENT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT__ALIAS_NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT__KEPT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT__REPRESENTED_ELEMENT = 2;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT__USE_REPRESENTED = 3;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT_FEATURE_COUNT = 4;

-

-	/**

-	 * The number of operations of the '<em>Virtual Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ELEMENT_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl <em>Virtual Classifier</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualClassifier()

-	 * @generated

-	 */

-	int VIRTUAL_CLASSIFIER = 2;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER__KEPT = VIRTUAL_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER__METAMODEL = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Classifier</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Virtual Classifier</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_CLASSIFIER_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl <em>Virtual Metaclass</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetaclass()

-	 * @generated

-	 */

-	int VIRTUAL_METACLASS = 3;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__KEPT = VIRTUAL_CLASSIFIER__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

-

-	/**

-	 * The feature id for the '<em><b>Abstract</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__ABSTRACT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Applied Stereotypes</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__APPLIED_STEREOTYPES = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Operations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__OPERATIONS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Parents</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__PARENTS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__PROPERTIES = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Stereotype Interface</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS__STEREOTYPE_INTERFACE = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 5;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Metaclass</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 6;

-

-	/**

-	 * The number of operations of the '<em>Virtual Metaclass</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_METACLASS_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl <em>Virtual Typed Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualTypedElement()

-	 * @generated

-	 */

-	int VIRTUAL_TYPED_ELEMENT = 10;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__KEPT = VIRTUAL_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Lower</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__LOWER = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Upper</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__UPPER = VIRTUAL_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT__TYPE = VIRTUAL_ELEMENT_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Typed Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 3;

-

-	/**

-	 * The number of operations of the '<em>Virtual Typed Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl <em>Virtual Property</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualProperty()

-	 * @generated

-	 */

-	int VIRTUAL_PROPERTY = 4;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Lower</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

-

-	/**

-	 * The feature id for the '<em><b>Upper</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

-

-	/**

-	 * The feature id for the '<em><b>Virtual Metaclass</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY__VIRTUAL_METACLASS = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Virtual Property</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PROPERTY_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl <em>Virtual Operation</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualOperation()

-	 * @generated

-	 */

-	int VIRTUAL_OPERATION = 5;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Lower</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

-

-	/**

-	 * The feature id for the '<em><b>Upper</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

-

-	/**

-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION__PARAMETERS = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Operation</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Virtual Operation</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_OPERATION_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl <em>Virtual Parameter</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualParameter()

-	 * @generated

-	 */

-	int VIRTUAL_PARAMETER = 6;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Lower</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

-

-	/**

-	 * The feature id for the '<em><b>Upper</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

-

-	/**

-	 * The feature id for the '<em><b>Type</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Parameter</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Virtual Parameter</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_PARAMETER_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl <em>Virtual Datatype</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualDatatype()

-	 * @generated

-	 */

-	int VIRTUAL_DATATYPE = 7;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE__KEPT = VIRTUAL_CLASSIFIER__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Datatype</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Virtual Datatype</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_DATATYPE_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl <em>Virtual Enum</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualEnum()

-	 * @generated

-	 */

-	int VIRTUAL_ENUM = 8;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__KEPT = VIRTUAL_CLASSIFIER__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

-

-	/**

-	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

-

-	/**

-	 * The feature id for the '<em><b>Literals</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM__LITERALS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Enum</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of operations of the '<em>Virtual Enum</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_ENUM_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl <em>Virtual Literal</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualLiteral()

-	 * @generated

-	 */

-	int VIRTUAL_LITERAL = 9;

-

-	/**

-	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

-

-	/**

-	 * The feature id for the '<em><b>Kept</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL__KEPT = VIRTUAL_ELEMENT__KEPT;

-

-	/**

-	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

-

-	/**

-	 * The number of structural features of the '<em>Virtual Literal</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of operations of the '<em>Virtual Literal</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int VIRTUAL_LITERAL_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel <em>Virtual Metamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Metamodel</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel

-	 * @generated

-	 */

-	EClass getVirtualMetamodel();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName()

-	 * @see #getVirtualMetamodel()

-	 * @generated

-	 */

-	EAttribute getVirtualMetamodel_Name();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Ns Prefix</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix()

-	 * @see #getVirtualMetamodel()

-	 * @generated

-	 */

-	EAttribute getVirtualMetamodel_NsPrefix();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Ns URI</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI()

-	 * @see #getVirtualMetamodel()

-	 * @generated

-	 */

-	EAttribute getVirtualMetamodel_NsURI();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Virtual Classifiers</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers()

-	 * @see #getVirtualMetamodel()

-	 * @generated

-	 */

-	EReference getVirtualMetamodel_VirtualClassifiers();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Facade</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade()

-	 * @see #getVirtualMetamodel()

-	 * @generated

-	 */

-	EReference getVirtualMetamodel_Facade();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement <em>Virtual Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Element</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement

-	 * @generated

-	 */

-	EClass getVirtualElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Alias Name</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName()

-	 * @see #getVirtualElement()

-	 * @generated

-	 */

-	EAttribute getVirtualElement_AliasName();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Kept</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept()

-	 * @see #getVirtualElement()

-	 * @generated

-	 */

-	EAttribute getVirtualElement_Kept();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Represented Element</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement()

-	 * @see #getVirtualElement()

-	 * @generated

-	 */

-	EReference getVirtualElement_RepresentedElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Use Represented</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented()

-	 * @see #getVirtualElement()

-	 * @generated

-	 */

-	EAttribute getVirtualElement_UseRepresented();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier <em>Virtual Classifier</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Classifier</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier

-	 * @generated

-	 */

-	EClass getVirtualClassifier();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Metamodel</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel()

-	 * @see #getVirtualClassifier()

-	 * @generated

-	 */

-	EReference getVirtualClassifier_Metamodel();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass <em>Virtual Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Metaclass</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass

-	 * @generated

-	 */

-	EClass getVirtualMetaclass();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Abstract</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EAttribute getVirtualMetaclass_Abstract();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes <em>Applied Stereotypes</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Applied Stereotypes</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EReference getVirtualMetaclass_AppliedStereotypes();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations <em>Operations</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Operations</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EReference getVirtualMetaclass_Operations();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents <em>Parents</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Parents</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EReference getVirtualMetaclass_Parents();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Properties</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EReference getVirtualMetaclass_Properties();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Stereotype Interface</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface()

-	 * @see #getVirtualMetaclass()

-	 * @generated

-	 */

-	EAttribute getVirtualMetaclass_StereotypeInterface();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty <em>Virtual Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Property</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty

-	 * @generated

-	 */

-	EClass getVirtualProperty();

-

-	/**

-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the container reference '<em>Virtual Metaclass</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass()

-	 * @see #getVirtualProperty()

-	 * @generated

-	 */

-	EReference getVirtualProperty_VirtualMetaclass();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation <em>Virtual Operation</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Operation</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation

-	 * @generated

-	 */

-	EClass getVirtualOperation();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters <em>Parameters</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Parameters</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters()

-	 * @see #getVirtualOperation()

-	 * @generated

-	 */

-	EReference getVirtualOperation_Parameters();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter <em>Virtual Parameter</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Parameter</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter

-	 * @generated

-	 */

-	EClass getVirtualParameter();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype <em>Virtual Datatype</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Datatype</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype

-	 * @generated

-	 */

-	EClass getVirtualDatatype();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum <em>Virtual Enum</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Enum</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum

-	 * @generated

-	 */

-	EClass getVirtualEnum();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals <em>Literals</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Literals</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals()

-	 * @see #getVirtualEnum()

-	 * @generated

-	 */

-	EReference getVirtualEnum_Literals();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral <em>Virtual Literal</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Literal</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral

-	 * @generated

-	 */

-	EClass getVirtualLiteral();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement <em>Virtual Typed Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Virtual Typed Element</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement

-	 * @generated

-	 */

-	EClass getVirtualTypedElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Lower</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower()

-	 * @see #getVirtualTypedElement()

-	 * @generated

-	 */

-	EAttribute getVirtualTypedElement_Lower();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Upper</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper()

-	 * @see #getVirtualTypedElement()

-	 * @generated

-	 */

-	EAttribute getVirtualTypedElement_Upper();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Type</em>'.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType()

-	 * @see #getVirtualTypedElement()

-	 * @generated

-	 */

-	EReference getVirtualTypedElement_Type();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	VirtualmetamodelFactory getVirtualmetamodelFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl <em>Virtual Metamodel</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetamodel()

-		 * @generated

-		 */

-		EClass VIRTUAL_METAMODEL = eINSTANCE.getVirtualMetamodel();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_METAMODEL__NAME = eINSTANCE.getVirtualMetamodel_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Ns Prefix</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_METAMODEL__NS_PREFIX = eINSTANCE.getVirtualMetamodel_NsPrefix();

-

-		/**

-		 * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_METAMODEL__NS_URI = eINSTANCE.getVirtualMetamodel_NsURI();

-

-		/**

-		 * The meta object literal for the '<em><b>Virtual Classifiers</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS = eINSTANCE.getVirtualMetamodel_VirtualClassifiers();

-

-		/**

-		 * The meta object literal for the '<em><b>Facade</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METAMODEL__FACADE = eINSTANCE.getVirtualMetamodel_Facade();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl <em>Virtual Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualElement()

-		 * @generated

-		 */

-		EClass VIRTUAL_ELEMENT = eINSTANCE.getVirtualElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Alias Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_ELEMENT__ALIAS_NAME = eINSTANCE.getVirtualElement_AliasName();

-

-		/**

-		 * The meta object literal for the '<em><b>Kept</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_ELEMENT__KEPT = eINSTANCE.getVirtualElement_Kept();

-

-		/**

-		 * The meta object literal for the '<em><b>Represented Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_ELEMENT__REPRESENTED_ELEMENT = eINSTANCE.getVirtualElement_RepresentedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Use Represented</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_ELEMENT__USE_REPRESENTED = eINSTANCE.getVirtualElement_UseRepresented();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl <em>Virtual Classifier</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualClassifier()

-		 * @generated

-		 */

-		EClass VIRTUAL_CLASSIFIER = eINSTANCE.getVirtualClassifier();

-

-		/**

-		 * The meta object literal for the '<em><b>Metamodel</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_CLASSIFIER__METAMODEL = eINSTANCE.getVirtualClassifier_Metamodel();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl <em>Virtual Metaclass</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetaclass()

-		 * @generated

-		 */

-		EClass VIRTUAL_METACLASS = eINSTANCE.getVirtualMetaclass();

-

-		/**

-		 * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_METACLASS__ABSTRACT = eINSTANCE.getVirtualMetaclass_Abstract();

-

-		/**

-		 * The meta object literal for the '<em><b>Applied Stereotypes</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METACLASS__APPLIED_STEREOTYPES = eINSTANCE.getVirtualMetaclass_AppliedStereotypes();

-

-		/**

-		 * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METACLASS__OPERATIONS = eINSTANCE.getVirtualMetaclass_Operations();

-

-		/**

-		 * The meta object literal for the '<em><b>Parents</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METACLASS__PARENTS = eINSTANCE.getVirtualMetaclass_Parents();

-

-		/**

-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_METACLASS__PROPERTIES = eINSTANCE.getVirtualMetaclass_Properties();

-

-		/**

-		 * The meta object literal for the '<em><b>Stereotype Interface</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_METACLASS__STEREOTYPE_INTERFACE = eINSTANCE.getVirtualMetaclass_StereotypeInterface();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl <em>Virtual Property</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualProperty()

-		 * @generated

-		 */

-		EClass VIRTUAL_PROPERTY = eINSTANCE.getVirtualProperty();

-

-		/**

-		 * The meta object literal for the '<em><b>Virtual Metaclass</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_PROPERTY__VIRTUAL_METACLASS = eINSTANCE.getVirtualProperty_VirtualMetaclass();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl <em>Virtual Operation</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualOperation()

-		 * @generated

-		 */

-		EClass VIRTUAL_OPERATION = eINSTANCE.getVirtualOperation();

-

-		/**

-		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_OPERATION__PARAMETERS = eINSTANCE.getVirtualOperation_Parameters();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl <em>Virtual Parameter</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualParameter()

-		 * @generated

-		 */

-		EClass VIRTUAL_PARAMETER = eINSTANCE.getVirtualParameter();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl <em>Virtual Datatype</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualDatatype()

-		 * @generated

-		 */

-		EClass VIRTUAL_DATATYPE = eINSTANCE.getVirtualDatatype();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl <em>Virtual Enum</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualEnum()

-		 * @generated

-		 */

-		EClass VIRTUAL_ENUM = eINSTANCE.getVirtualEnum();

-

-		/**

-		 * The meta object literal for the '<em><b>Literals</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_ENUM__LITERALS = eINSTANCE.getVirtualEnum_Literals();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl <em>Virtual Literal</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualLiteral()

-		 * @generated

-		 */

-		EClass VIRTUAL_LITERAL = eINSTANCE.getVirtualLiteral();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl <em>Virtual Typed Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl

-		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualTypedElement()

-		 * @generated

-		 */

-		EClass VIRTUAL_TYPED_ELEMENT = eINSTANCE.getVirtualTypedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_TYPED_ELEMENT__LOWER = eINSTANCE.getVirtualTypedElement_Lower();

-

-		/**

-		 * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute VIRTUAL_TYPED_ELEMENT__UPPER = eINSTANCE.getVirtualTypedElement_Upper();

-

-		/**

-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference VIRTUAL_TYPED_ELEMENT__TYPE = eINSTANCE.getVirtualTypedElement_Type();

-

-	}

-

-} // VirtualmetamodelPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java
deleted file mode 100644
index d53c93ec6aa..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Classifier</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl#getMetamodel <em>Metamodel</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class VirtualClassifierImpl extends VirtualElementImpl implements VirtualClassifier {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualClassifierImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_CLASSIFIER;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualMetamodel getMetamodel() {

-		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL) {

-			return null;

-		}

-		return (VirtualMetamodel) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetMetamodel(VirtualMetamodel newMetamodel, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newMetamodel, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setMetamodel(VirtualMetamodel newMetamodel) {

-		if (newMetamodel != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL && newMetamodel != null)) {

-			if (EcoreUtil.isAncestor(this, newMetamodel)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newMetamodel != null) {

-				msgs = ((InternalEObject) newMetamodel).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualMetamodel.class, msgs);

-			}

-			msgs = basicSetMetamodel(newMetamodel, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL, newMetamodel, newMetamodel));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetMetamodel((VirtualMetamodel) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			return basicSetMetamodel(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			return eInternalContainer().eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualMetamodel.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			return getMetamodel();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			setMetamodel((VirtualMetamodel) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			setMetamodel((VirtualMetamodel) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

-			return getMetamodel() != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // VirtualClassifierImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java
deleted file mode 100644
index 39e92c6daa7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Datatype</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class VirtualDatatypeImpl extends VirtualClassifierImpl implements VirtualDatatype {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualDatatypeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_DATATYPE;

-	}

-

-} // VirtualDatatypeImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java
deleted file mode 100644
index 99c08aec53b..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#getAliasName <em>Alias Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#isKept <em>Kept</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#getRepresentedElement <em>Represented Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#isUseRepresented <em>Use Represented</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class VirtualElementImpl extends MinimalEObjectImpl.Container implements VirtualElement {

-	/**

-	 * The default value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAliasName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ALIAS_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAliasName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String aliasName = ALIAS_NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isKept() <em>Kept</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isKept()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean KEPT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isKept() <em>Kept</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isKept()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean kept = KEPT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getRepresentedElement() <em>Represented Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRepresentedElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject representedElement;

-

-	/**

-	 * The default value of the '{@link #isUseRepresented() <em>Use Represented</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isUseRepresented()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean USE_REPRESENTED_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isUseRepresented() <em>Use Represented</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isUseRepresented()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean useRepresented = USE_REPRESENTED_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getAliasName() {

-		return aliasName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setAliasName(String newAliasName) {

-		String oldAliasName = aliasName;

-		aliasName = newAliasName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME, oldAliasName, aliasName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isKept() {

-		return kept;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setKept(boolean newKept) {

-		boolean oldKept = kept;

-		kept = newKept;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT, oldKept, kept));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject getRepresentedElement() {

-		if (representedElement != null && representedElement.eIsProxy()) {

-			InternalEObject oldRepresentedElement = (InternalEObject) representedElement;

-			representedElement = eResolveProxy(oldRepresentedElement);

-			if (representedElement != oldRepresentedElement) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT, oldRepresentedElement, representedElement));

-				}

-			}

-		}

-		return representedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetRepresentedElement() {

-		return representedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setRepresentedElement(EObject newRepresentedElement) {

-		EObject oldRepresentedElement = representedElement;

-		representedElement = newRepresentedElement;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT, oldRepresentedElement, representedElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isUseRepresented() {

-		return useRepresented;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUseRepresented(boolean newUseRepresented) {

-		boolean oldUseRepresented = useRepresented;

-		useRepresented = newUseRepresented;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED, oldUseRepresented, useRepresented));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

-			return getAliasName();

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

-			return isKept();

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

-			if (resolve) {

-				return getRepresentedElement();

-			}

-			return basicGetRepresentedElement();

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

-			return isUseRepresented();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

-			setAliasName((String) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

-			setKept((Boolean) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

-			setRepresentedElement((EObject) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

-			setUseRepresented((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

-			setAliasName(ALIAS_NAME_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

-			setKept(KEPT_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

-			setRepresentedElement((EObject) null);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

-			setUseRepresented(USE_REPRESENTED_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

-			return ALIAS_NAME_EDEFAULT == null ? aliasName != null : !ALIAS_NAME_EDEFAULT.equals(aliasName);

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

-			return kept != KEPT_EDEFAULT;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

-			return representedElement != null;

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

-			return useRepresented != USE_REPRESENTED_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (aliasName: ");

-		result.append(aliasName);

-		result.append(", kept: ");

-		result.append(kept);

-		result.append(", useRepresented: ");

-		result.append(useRepresented);

-		result.append(')');

-		return result.toString();

-	}

-

-} // VirtualElementImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java
deleted file mode 100644
index c67688050a4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Enum</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl#getLiterals <em>Literals</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class VirtualEnumImpl extends VirtualClassifierImpl implements VirtualEnum {

-	/**

-	 * The cached value of the '{@link #getLiterals() <em>Literals</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLiterals()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualLiteral> literals;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualEnumImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_ENUM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualLiteral> getLiterals() {

-		if (literals == null) {

-			literals = new EObjectContainmentEList<VirtualLiteral>(VirtualLiteral.class, this, VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS);

-		}

-		return literals;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			return ((InternalEList<?>) getLiterals()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			return getLiterals();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			getLiterals().clear();

-			getLiterals().addAll((Collection<? extends VirtualLiteral>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			getLiterals().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

-			return literals != null && !literals.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // VirtualEnumImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java
deleted file mode 100644
index 09c9e04e4ad..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Literal</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class VirtualLiteralImpl extends VirtualElementImpl implements VirtualLiteral {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualLiteralImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_LITERAL;

-	}

-

-} // VirtualLiteralImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java
deleted file mode 100644
index 6306078ed20..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Metaclass</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#isAbstract <em>Abstract</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getOperations <em>Operations</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getParents <em>Parents</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getProperties <em>Properties</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#isStereotypeInterface <em>Stereotype Interface</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class VirtualMetaclassImpl extends VirtualClassifierImpl implements VirtualMetaclass {

-	/**

-	 * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isAbstract()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean ABSTRACT_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isAbstract()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean abstract_ = ABSTRACT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getAppliedStereotypes() <em>Applied Stereotypes</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAppliedStereotypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseMetaclass> appliedStereotypes;

-

-	/**

-	 * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getOperations()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualOperation> operations;

-

-	/**

-	 * The cached value of the '{@link #getParents() <em>Parents</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getParents()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualMetaclass> parents;

-

-	/**

-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getProperties()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualProperty> properties;

-

-	/**

-	 * The default value of the '{@link #isStereotypeInterface() <em>Stereotype Interface</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isStereotypeInterface()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean STEREOTYPE_INTERFACE_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isStereotypeInterface() <em>Stereotype Interface</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isStereotypeInterface()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean stereotypeInterface = STEREOTYPE_INTERFACE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualMetaclassImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isAbstract() {

-		return abstract_;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setAbstract(boolean newAbstract) {

-		boolean oldAbstract = abstract_;

-		abstract_ = newAbstract;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT, oldAbstract, abstract_));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<BaseMetaclass> getAppliedStereotypes() {

-		if (appliedStereotypes == null) {

-			appliedStereotypes = new EObjectResolvingEList<BaseMetaclass>(BaseMetaclass.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES);

-		}

-		return appliedStereotypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualOperation> getOperations() {

-		if (operations == null) {

-			operations = new EObjectContainmentEList<VirtualOperation>(VirtualOperation.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS);

-		}

-		return operations;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualMetaclass> getParents() {

-		if (parents == null) {

-			parents = new EObjectResolvingEList<VirtualMetaclass>(VirtualMetaclass.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS);

-		}

-		return parents;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualProperty> getProperties() {

-		if (properties == null) {

-			properties = new EObjectContainmentWithInverseEList<VirtualProperty>(VirtualProperty.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS);

-		}

-		return properties;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean isStereotypeInterface() {

-		return stereotypeInterface;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setStereotypeInterface(boolean newStereotypeInterface) {

-		boolean oldStereotypeInterface = stereotypeInterface;

-		stereotypeInterface = newStereotypeInterface;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE, oldStereotypeInterface, stereotypeInterface));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getProperties()).basicAdd(otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-			return ((InternalEList<?>) getOperations()).basicRemove(otherEnd, msgs);

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			return ((InternalEList<?>) getProperties()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

-			return isAbstract();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

-			return getAppliedStereotypes();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-			return getOperations();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

-			return getParents();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			return getProperties();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

-			return isStereotypeInterface();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

-			setAbstract((Boolean) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

-			getAppliedStereotypes().clear();

-			getAppliedStereotypes().addAll((Collection<? extends BaseMetaclass>) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-			getOperations().clear();

-			getOperations().addAll((Collection<? extends VirtualOperation>) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

-			getParents().clear();

-			getParents().addAll((Collection<? extends VirtualMetaclass>) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			getProperties().clear();

-			getProperties().addAll((Collection<? extends VirtualProperty>) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

-			setStereotypeInterface((Boolean) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

-			setAbstract(ABSTRACT_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

-			getAppliedStereotypes().clear();

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-			getOperations().clear();

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

-			getParents().clear();

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			getProperties().clear();

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

-			setStereotypeInterface(STEREOTYPE_INTERFACE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

-			return abstract_ != ABSTRACT_EDEFAULT;

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

-			return appliedStereotypes != null && !appliedStereotypes.isEmpty();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

-			return operations != null && !operations.isEmpty();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

-			return parents != null && !parents.isEmpty();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

-			return properties != null && !properties.isEmpty();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

-			return stereotypeInterface != STEREOTYPE_INTERFACE_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (abstract: ");

-		result.append(abstract_);

-		result.append(", stereotypeInterface: ");

-		result.append(stereotypeInterface);

-		result.append(')');

-		return result.toString();

-	}

-

-} // VirtualMetaclassImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java
deleted file mode 100644
index 523d3398924..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Metamodel</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getNsPrefix <em>Ns Prefix</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getNsURI <em>Ns URI</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getVirtualClassifiers <em>Virtual Classifiers</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getFacade <em>Facade</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class VirtualMetamodelImpl extends MinimalEObjectImpl.Container implements VirtualMetamodel {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getNsPrefix() <em>Ns Prefix</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNsPrefix()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NS_PREFIX_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getNsPrefix() <em>Ns Prefix</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNsPrefix()

-	 * @generated

-	 * @ordered

-	 */

-	protected String nsPrefix = NS_PREFIX_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNsURI()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NS_URI_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getNsURI()

-	 * @generated

-	 * @ordered

-	 */

-	protected String nsURI = NS_URI_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getVirtualClassifiers() <em>Virtual Classifiers</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getVirtualClassifiers()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualClassifier> virtualClassifiers;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualMetamodelImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setName(String newName) {

-		String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getNsPrefix() {

-		return nsPrefix;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setNsPrefix(String newNsPrefix) {

-		String oldNsPrefix = nsPrefix;

-		nsPrefix = newNsPrefix;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX, oldNsPrefix, nsPrefix));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getNsURI() {

-		return nsURI;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setNsURI(String newNsURI) {

-		String oldNsURI = nsURI;

-		nsURI = newNsURI;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI, oldNsURI, nsURI));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualClassifier> getVirtualClassifiers() {

-		if (virtualClassifiers == null) {

-			virtualClassifiers = new EObjectContainmentWithInverseEList<VirtualClassifier>(VirtualClassifier.class, this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL);

-		}

-		return virtualClassifiers;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Facade getFacade() {

-		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE) {

-			return null;

-		}

-		return (Facade) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetFacade(Facade newFacade, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newFacade, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setFacade(Facade newFacade) {

-		if (newFacade != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE && newFacade != null)) {

-			if (EcoreUtil.isAncestor(this, newFacade)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newFacade != null) {

-				msgs = ((InternalEObject) newFacade).eInverseAdd(this, FacadePackage.FACADE__VIRTUALMETAMODEL, Facade.class, msgs);

-			}

-			msgs = basicSetFacade(newFacade, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, newFacade, newFacade));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getVirtualClassifiers()).basicAdd(otherEnd, msgs);

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetFacade((Facade) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			return ((InternalEList<?>) getVirtualClassifiers()).basicRemove(otherEnd, msgs);

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			return basicSetFacade(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			return eInternalContainer().eInverseRemove(this, FacadePackage.FACADE__VIRTUALMETAMODEL, Facade.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

-			return getName();

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

-			return getNsPrefix();

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

-			return getNsURI();

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			return getVirtualClassifiers();

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			return getFacade();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

-			setName((String) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

-			setNsPrefix((String) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

-			setNsURI((String) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			getVirtualClassifiers().clear();

-			getVirtualClassifiers().addAll((Collection<? extends VirtualClassifier>) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			setFacade((Facade) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

-			setNsPrefix(NS_PREFIX_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

-			setNsURI(NS_URI_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			getVirtualClassifiers().clear();

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			setFacade((Facade) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

-			return NS_PREFIX_EDEFAULT == null ? nsPrefix != null : !NS_PREFIX_EDEFAULT.equals(nsPrefix);

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

-			return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

-			return virtualClassifiers != null && !virtualClassifiers.isEmpty();

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

-			return getFacade() != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: ");

-		result.append(name);

-		result.append(", nsPrefix: ");

-		result.append(nsPrefix);

-		result.append(", nsURI: ");

-		result.append(nsURI);

-		result.append(')');

-		return result.toString();

-	}

-

-} // VirtualMetamodelImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java
deleted file mode 100644
index 8c4a4874e8a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Operation</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl#getParameters <em>Parameters</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class VirtualOperationImpl extends VirtualTypedElementImpl implements VirtualOperation {

-	/**

-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getParameters()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<VirtualParameter> parameters;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualOperationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<VirtualParameter> getParameters() {

-		if (parameters == null) {

-			parameters = new EObjectContainmentEList<VirtualParameter>(VirtualParameter.class, this, VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS);

-		}

-		return parameters;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			return ((InternalEList<?>) getParameters()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			return getParameters();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			getParameters().clear();

-			getParameters().addAll((Collection<? extends VirtualParameter>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			getParameters().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

-			return parameters != null && !parameters.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // VirtualOperationImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java
deleted file mode 100644
index 3db2daf49c0..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Parameter</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class VirtualParameterImpl extends VirtualTypedElementImpl implements VirtualParameter {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualParameterImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_PARAMETER;

-	}

-

-} // VirtualParameterImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java
deleted file mode 100644
index 1bd45920e41..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Property</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl#getVirtualMetaclass <em>Virtual Metaclass</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class VirtualPropertyImpl extends VirtualTypedElementImpl implements VirtualProperty {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualPropertyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_PROPERTY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualMetaclass getVirtualMetaclass() {

-		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS) {

-			return null;

-		}

-		return (VirtualMetaclass) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetVirtualMetaclass(VirtualMetaclass newVirtualMetaclass, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newVirtualMetaclass, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setVirtualMetaclass(VirtualMetaclass newVirtualMetaclass) {

-		if (newVirtualMetaclass != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS && newVirtualMetaclass != null)) {

-			if (EcoreUtil.isAncestor(this, newVirtualMetaclass)) {

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newVirtualMetaclass != null) {

-				msgs = ((InternalEObject) newVirtualMetaclass).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualMetaclass.class, msgs);

-			}

-			msgs = basicSetVirtualMetaclass(newVirtualMetaclass, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS, newVirtualMetaclass, newVirtualMetaclass));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetVirtualMetaclass((VirtualMetaclass) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			return basicSetVirtualMetaclass(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID()) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			return eInternalContainer().eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualMetaclass.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			return getVirtualMetaclass();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			setVirtualMetaclass((VirtualMetaclass) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			setVirtualMetaclass((VirtualMetaclass) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

-			return getVirtualMetaclass() != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // VirtualPropertyImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java
deleted file mode 100644
index 33f940e16d1..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Virtual Typed Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getLower <em>Lower</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getUpper <em>Upper</em>}</li>

- * <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getType <em>Type</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public abstract class VirtualTypedElementImpl extends VirtualElementImpl implements VirtualTypedElement {

-	/**

-	 * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLower()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int LOWER_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getLower()

-	 * @generated

-	 * @ordered

-	 */

-	protected int lower = LOWER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUpper()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final int UPPER_EDEFAULT = 0;

-

-	/**

-	 * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUpper()

-	 * @generated

-	 * @ordered

-	 */

-	protected int upper = UPPER_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getType()

-	 * @generated

-	 * @ordered

-	 */

-	protected VirtualClassifier type;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualTypedElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getLower() {

-		return lower;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setLower(int newLower) {

-		int oldLower = lower;

-		lower = newLower;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER, oldLower, lower));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getUpper() {

-		return upper;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUpper(int newUpper) {

-		int oldUpper = upper;

-		upper = newUpper;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER, oldUpper, upper));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualClassifier getType() {

-		if (type != null && type.eIsProxy()) {

-			InternalEObject oldType = (InternalEObject) type;

-			type = (VirtualClassifier) eResolveProxy(oldType);

-			if (type != oldType) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE, oldType, type));

-				}

-			}

-		}

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualClassifier basicGetType() {

-		return type;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setType(VirtualClassifier newType) {

-		VirtualClassifier oldType = type;

-		type = newType;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE, oldType, type));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

-			return getLower();

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

-			return getUpper();

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

-			if (resolve) {

-				return getType();

-			}

-			return basicGetType();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

-			setLower((Integer) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

-			setUpper((Integer) newValue);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

-			setType((VirtualClassifier) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

-			setLower(LOWER_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

-			setUpper(UPPER_EDEFAULT);

-			return;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

-			setType((VirtualClassifier) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

-			return lower != LOWER_EDEFAULT;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

-			return upper != UPPER_EDEFAULT;

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

-			return type != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (lower: ");

-		result.append(lower);

-		result.append(", upper: ");

-		result.append(upper);

-		result.append(')');

-		return result.toString();

-	}

-

-} // VirtualTypedElementImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java
deleted file mode 100644
index 2e984be20a2..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelFactoryImpl extends EFactoryImpl implements VirtualmetamodelFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static VirtualmetamodelFactory init() {

-		try {

-			VirtualmetamodelFactory theVirtualmetamodelFactory = (VirtualmetamodelFactory) EPackage.Registry.INSTANCE.getEFactory(VirtualmetamodelPackage.eNS_URI);

-			if (theVirtualmetamodelFactory != null) {

-				return theVirtualmetamodelFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new VirtualmetamodelFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL:

-			return createVirtualMetamodel();

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS:

-			return createVirtualMetaclass();

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY:

-			return createVirtualProperty();

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION:

-			return createVirtualOperation();

-		case VirtualmetamodelPackage.VIRTUAL_PARAMETER:

-			return createVirtualParameter();

-		case VirtualmetamodelPackage.VIRTUAL_DATATYPE:

-			return createVirtualDatatype();

-		case VirtualmetamodelPackage.VIRTUAL_ENUM:

-			return createVirtualEnum();

-		case VirtualmetamodelPackage.VIRTUAL_LITERAL:

-			return createVirtualLiteral();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualMetamodel createVirtualMetamodel() {

-		VirtualMetamodelImpl virtualMetamodel = new VirtualMetamodelImpl();

-		return virtualMetamodel;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualMetaclass createVirtualMetaclass() {

-		VirtualMetaclassImpl virtualMetaclass = new VirtualMetaclassImpl();

-		return virtualMetaclass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualProperty createVirtualProperty() {

-		VirtualPropertyImpl virtualProperty = new VirtualPropertyImpl();

-		return virtualProperty;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualOperation createVirtualOperation() {

-		VirtualOperationImpl virtualOperation = new VirtualOperationImpl();

-		return virtualOperation;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualParameter createVirtualParameter() {

-		VirtualParameterImpl virtualParameter = new VirtualParameterImpl();

-		return virtualParameter;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualDatatype createVirtualDatatype() {

-		VirtualDatatypeImpl virtualDatatype = new VirtualDatatypeImpl();

-		return virtualDatatype;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualEnum createVirtualEnum() {

-		VirtualEnumImpl virtualEnum = new VirtualEnumImpl();

-		return virtualEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualLiteral createVirtualLiteral() {

-		VirtualLiteralImpl virtualLiteral = new VirtualLiteralImpl();

-		return virtualLiteral;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualmetamodelPackage getVirtualmetamodelPackage() {

-		return (VirtualmetamodelPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static VirtualmetamodelPackage getPackage() {

-		return VirtualmetamodelPackage.eINSTANCE;

-	}

-

-} // VirtualmetamodelFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java
deleted file mode 100644
index 49f358abae2..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java
+++ /dev/null
@@ -1,757 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.facade.FacadePackage;

-import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

-import org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl;

-import org.eclipse.papyrus.facade.impl.FacadePackageImpl;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-import org.eclipse.uml2.types.TypesPackage;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelPackageImpl extends EPackageImpl implements VirtualmetamodelPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualMetamodelEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualClassifierEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualMetaclassEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualPropertyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualOperationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualParameterEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualDatatypeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualEnumEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualLiteralEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass virtualTypedElementEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private VirtualmetamodelPackageImpl() {

-		super(eNS_URI, VirtualmetamodelFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link VirtualmetamodelPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static VirtualmetamodelPackage init() {

-		if (isInited) {

-			return (VirtualmetamodelPackage) EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VirtualmetamodelPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		UMLPackage.eINSTANCE.eClass();

-

-		// Obtain or create and register interdependencies

-		FacadePackageImpl theFacadePackage = (FacadePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) : FacadePackage.eINSTANCE);

-		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE

-				.getEPackage(ExtensiondefinitionPackage.eNS_URI) : ExtensiondefinitionPackage.eINSTANCE);

-

-		// Create package meta-data objects

-		theVirtualmetamodelPackage.createPackageContents();

-		theFacadePackage.createPackageContents();

-		theExtensiondefinitionPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theVirtualmetamodelPackage.initializePackageContents();

-		theFacadePackage.initializePackageContents();

-		theExtensiondefinitionPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theVirtualmetamodelPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(VirtualmetamodelPackage.eNS_URI, theVirtualmetamodelPackage);

-		return theVirtualmetamodelPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualMetamodel() {

-		return virtualMetamodelEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualMetamodel_Name() {

-		return (EAttribute) virtualMetamodelEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualMetamodel_NsPrefix() {

-		return (EAttribute) virtualMetamodelEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualMetamodel_NsURI() {

-		return (EAttribute) virtualMetamodelEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetamodel_VirtualClassifiers() {

-		return (EReference) virtualMetamodelEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetamodel_Facade() {

-		return (EReference) virtualMetamodelEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualElement() {

-		return virtualElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualElement_AliasName() {

-		return (EAttribute) virtualElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualElement_Kept() {

-		return (EAttribute) virtualElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualElement_RepresentedElement() {

-		return (EReference) virtualElementEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualElement_UseRepresented() {

-		return (EAttribute) virtualElementEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualClassifier() {

-		return virtualClassifierEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualClassifier_Metamodel() {

-		return (EReference) virtualClassifierEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualMetaclass() {

-		return virtualMetaclassEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualMetaclass_Abstract() {

-		return (EAttribute) virtualMetaclassEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetaclass_AppliedStereotypes() {

-		return (EReference) virtualMetaclassEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetaclass_Operations() {

-		return (EReference) virtualMetaclassEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetaclass_Parents() {

-		return (EReference) virtualMetaclassEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualMetaclass_Properties() {

-		return (EReference) virtualMetaclassEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualMetaclass_StereotypeInterface() {

-		return (EAttribute) virtualMetaclassEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualProperty() {

-		return virtualPropertyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualProperty_VirtualMetaclass() {

-		return (EReference) virtualPropertyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualOperation() {

-		return virtualOperationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualOperation_Parameters() {

-		return (EReference) virtualOperationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualParameter() {

-		return virtualParameterEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualDatatype() {

-		return virtualDatatypeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualEnum() {

-		return virtualEnumEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualEnum_Literals() {

-		return (EReference) virtualEnumEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualLiteral() {

-		return virtualLiteralEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getVirtualTypedElement() {

-		return virtualTypedElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualTypedElement_Lower() {

-		return (EAttribute) virtualTypedElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getVirtualTypedElement_Upper() {

-		return (EAttribute) virtualTypedElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getVirtualTypedElement_Type() {

-		return (EReference) virtualTypedElementEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public VirtualmetamodelFactory getVirtualmetamodelFactory() {

-		return (VirtualmetamodelFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		virtualMetamodelEClass = createEClass(VIRTUAL_METAMODEL);

-		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NAME);

-		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NS_PREFIX);

-		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NS_URI);

-		createEReference(virtualMetamodelEClass, VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS);

-		createEReference(virtualMetamodelEClass, VIRTUAL_METAMODEL__FACADE);

-

-		virtualElementEClass = createEClass(VIRTUAL_ELEMENT);

-		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__ALIAS_NAME);

-		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__KEPT);

-		createEReference(virtualElementEClass, VIRTUAL_ELEMENT__REPRESENTED_ELEMENT);

-		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__USE_REPRESENTED);

-

-		virtualClassifierEClass = createEClass(VIRTUAL_CLASSIFIER);

-		createEReference(virtualClassifierEClass, VIRTUAL_CLASSIFIER__METAMODEL);

-

-		virtualMetaclassEClass = createEClass(VIRTUAL_METACLASS);

-		createEAttribute(virtualMetaclassEClass, VIRTUAL_METACLASS__ABSTRACT);

-		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__APPLIED_STEREOTYPES);

-		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__OPERATIONS);

-		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__PARENTS);

-		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__PROPERTIES);

-		createEAttribute(virtualMetaclassEClass, VIRTUAL_METACLASS__STEREOTYPE_INTERFACE);

-

-		virtualPropertyEClass = createEClass(VIRTUAL_PROPERTY);

-		createEReference(virtualPropertyEClass, VIRTUAL_PROPERTY__VIRTUAL_METACLASS);

-

-		virtualOperationEClass = createEClass(VIRTUAL_OPERATION);

-		createEReference(virtualOperationEClass, VIRTUAL_OPERATION__PARAMETERS);

-

-		virtualParameterEClass = createEClass(VIRTUAL_PARAMETER);

-

-		virtualDatatypeEClass = createEClass(VIRTUAL_DATATYPE);

-

-		virtualEnumEClass = createEClass(VIRTUAL_ENUM);

-		createEReference(virtualEnumEClass, VIRTUAL_ENUM__LITERALS);

-

-		virtualLiteralEClass = createEClass(VIRTUAL_LITERAL);

-

-		virtualTypedElementEClass = createEClass(VIRTUAL_TYPED_ELEMENT);

-		createEAttribute(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__LOWER);

-		createEAttribute(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__UPPER);

-		createEReference(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__TYPE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		FacadePackage theFacadePackage = (FacadePackage) EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

-		ExtensiondefinitionPackage theExtensiondefinitionPackage = (ExtensiondefinitionPackage) EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

-		TypesPackage theTypesPackage = (TypesPackage) EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		virtualClassifierEClass.getESuperTypes().add(this.getVirtualElement());

-		virtualMetaclassEClass.getESuperTypes().add(this.getVirtualClassifier());

-		virtualPropertyEClass.getESuperTypes().add(this.getVirtualTypedElement());

-		virtualOperationEClass.getESuperTypes().add(this.getVirtualTypedElement());

-		virtualParameterEClass.getESuperTypes().add(this.getVirtualTypedElement());

-		virtualDatatypeEClass.getESuperTypes().add(this.getVirtualClassifier());

-		virtualEnumEClass.getESuperTypes().add(this.getVirtualClassifier());

-		virtualLiteralEClass.getESuperTypes().add(this.getVirtualElement());

-		virtualTypedElementEClass.getESuperTypes().add(this.getVirtualElement());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(virtualMetamodelEClass, VirtualMetamodel.class, "VirtualMetamodel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getVirtualMetamodel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualMetamodel_NsPrefix(), theEcorePackage.getEString(), "nsPrefix", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualMetamodel_NsURI(), theEcorePackage.getEString(), "nsURI", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualMetamodel_VirtualClassifiers(), this.getVirtualClassifier(), this.getVirtualClassifier_Metamodel(), "virtualClassifiers", null, 0, -1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualMetamodel_Facade(), theFacadePackage.getFacade(), theFacadePackage.getFacade_Virtualmetamodel(), "facade", null, 1, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualElementEClass, VirtualElement.class, "VirtualElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getVirtualElement_AliasName(), ecorePackage.getEString(), "aliasName", null, 0, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualElement_Kept(), ecorePackage.getEBoolean(), "kept", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualElement_RepresentedElement(), theEcorePackage.getEObject(), null, "representedElement", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualElement_UseRepresented(), ecorePackage.getEBoolean(), "useRepresented", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualClassifierEClass, VirtualClassifier.class, "VirtualClassifier", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getVirtualClassifier_Metamodel(), this.getVirtualMetamodel(), this.getVirtualMetamodel_VirtualClassifiers(), "metamodel", null, 1, 1, VirtualClassifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualMetaclassEClass, VirtualMetaclass.class, "VirtualMetaclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getVirtualMetaclass_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualMetaclass_AppliedStereotypes(), theExtensiondefinitionPackage.getBaseMetaclass(), null, "appliedStereotypes", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualMetaclass_Operations(), this.getVirtualOperation(), null, "operations", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualMetaclass_Parents(), this.getVirtualMetaclass(), null, "parents", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEReference(getVirtualMetaclass_Properties(), this.getVirtualProperty(), this.getVirtualProperty_VirtualMetaclass(), "properties", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualMetaclass_StereotypeInterface(), theTypesPackage.getBoolean(), "stereotypeInterface", null, 1, 1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualPropertyEClass, VirtualProperty.class, "VirtualProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getVirtualProperty_VirtualMetaclass(), this.getVirtualMetaclass(), this.getVirtualMetaclass_Properties(), "virtualMetaclass", null, 1, 1, VirtualProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualOperationEClass, VirtualOperation.class, "VirtualOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getVirtualOperation_Parameters(), this.getVirtualParameter(), null, "parameters", null, 0, -1, VirtualOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualParameterEClass, VirtualParameter.class, "VirtualParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(virtualDatatypeEClass, VirtualDatatype.class, "VirtualDatatype", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(virtualEnumEClass, VirtualEnum.class, "VirtualEnum", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getVirtualEnum_Literals(), this.getVirtualLiteral(), null, "literals", null, 0, -1, VirtualEnum.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(virtualLiteralEClass, VirtualLiteral.class, "VirtualLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(virtualTypedElementEClass, VirtualTypedElement.class, "VirtualTypedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getVirtualTypedElement_Lower(), ecorePackage.getEInt(), "lower", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getVirtualTypedElement_Upper(), ecorePackage.getEInt(), "upper", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getVirtualTypedElement_Type(), this.getVirtualClassifier(), null, "type", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-	}

-

-} // VirtualmetamodelPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java
deleted file mode 100644
index 371e493d1b4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

- * @generated

- */

-public class VirtualmetamodelAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static VirtualmetamodelPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = VirtualmetamodelPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected VirtualmetamodelSwitch<Adapter> modelSwitch =

-			new VirtualmetamodelSwitch<Adapter>() {

-				@Override

-				public Adapter caseVirtualMetamodel(VirtualMetamodel object) {

-					return createVirtualMetamodelAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualElement(VirtualElement object) {

-					return createVirtualElementAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualClassifier(VirtualClassifier object) {

-					return createVirtualClassifierAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualMetaclass(VirtualMetaclass object) {

-					return createVirtualMetaclassAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualProperty(VirtualProperty object) {

-					return createVirtualPropertyAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualOperation(VirtualOperation object) {

-					return createVirtualOperationAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualParameter(VirtualParameter object) {

-					return createVirtualParameterAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualDatatype(VirtualDatatype object) {

-					return createVirtualDatatypeAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualEnum(VirtualEnum object) {

-					return createVirtualEnumAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualLiteral(VirtualLiteral object) {

-					return createVirtualLiteralAdapter();

-				}

-

-				@Override

-				public Adapter caseVirtualTypedElement(VirtualTypedElement object) {

-					return createVirtualTypedElementAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel <em>Virtual Metamodel</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel

-	 * @generated

-	 */

-	public Adapter createVirtualMetamodelAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement <em>Virtual Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement

-	 * @generated

-	 */

-	public Adapter createVirtualElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier <em>Virtual Classifier</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier

-	 * @generated

-	 */

-	public Adapter createVirtualClassifierAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass <em>Virtual Metaclass</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass

-	 * @generated

-	 */

-	public Adapter createVirtualMetaclassAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty <em>Virtual Property</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty

-	 * @generated

-	 */

-	public Adapter createVirtualPropertyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation <em>Virtual Operation</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation

-	 * @generated

-	 */

-	public Adapter createVirtualOperationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter <em>Virtual Parameter</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter

-	 * @generated

-	 */

-	public Adapter createVirtualParameterAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype <em>Virtual Datatype</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype

-	 * @generated

-	 */

-	public Adapter createVirtualDatatypeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum <em>Virtual Enum</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum

-	 * @generated

-	 */

-	public Adapter createVirtualEnumAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral <em>Virtual Literal</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral

-	 * @generated

-	 */

-	public Adapter createVirtualLiteralAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement <em>Virtual Typed Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement

-	 * @generated

-	 */

-	public Adapter createVirtualTypedElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // VirtualmetamodelAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java
deleted file mode 100644
index a47f71b709a..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceImpl

- * @generated

- */

-public class VirtualmetamodelResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new VirtualmetamodelResourceImpl(uri);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

-		return result;

-	}

-

-} // VirtualmetamodelResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java
deleted file mode 100644
index 2eeaf3a25a5..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceFactoryImpl

- * @generated

- */

-public class VirtualmetamodelResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public VirtualmetamodelResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // VirtualmetamodelResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java
deleted file mode 100644
index bf355ed73f8..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

- * @generated

- */

-public class VirtualmetamodelSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static VirtualmetamodelPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelSwitch() {

-		if (modelPackage == null) {

-			modelPackage = VirtualmetamodelPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case VirtualmetamodelPackage.VIRTUAL_METAMODEL: {

-			VirtualMetamodel virtualMetamodel = (VirtualMetamodel) theEObject;

-			T result = caseVirtualMetamodel(virtualMetamodel);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_ELEMENT: {

-			VirtualElement virtualElement = (VirtualElement) theEObject;

-			T result = caseVirtualElement(virtualElement);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER: {

-			VirtualClassifier virtualClassifier = (VirtualClassifier) theEObject;

-			T result = caseVirtualClassifier(virtualClassifier);

-			if (result == null) {

-				result = caseVirtualElement(virtualClassifier);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_METACLASS: {

-			VirtualMetaclass virtualMetaclass = (VirtualMetaclass) theEObject;

-			T result = caseVirtualMetaclass(virtualMetaclass);

-			if (result == null) {

-				result = caseVirtualClassifier(virtualMetaclass);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualMetaclass);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_PROPERTY: {

-			VirtualProperty virtualProperty = (VirtualProperty) theEObject;

-			T result = caseVirtualProperty(virtualProperty);

-			if (result == null) {

-				result = caseVirtualTypedElement(virtualProperty);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualProperty);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_OPERATION: {

-			VirtualOperation virtualOperation = (VirtualOperation) theEObject;

-			T result = caseVirtualOperation(virtualOperation);

-			if (result == null) {

-				result = caseVirtualTypedElement(virtualOperation);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualOperation);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_PARAMETER: {

-			VirtualParameter virtualParameter = (VirtualParameter) theEObject;

-			T result = caseVirtualParameter(virtualParameter);

-			if (result == null) {

-				result = caseVirtualTypedElement(virtualParameter);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualParameter);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_DATATYPE: {

-			VirtualDatatype virtualDatatype = (VirtualDatatype) theEObject;

-			T result = caseVirtualDatatype(virtualDatatype);

-			if (result == null) {

-				result = caseVirtualClassifier(virtualDatatype);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualDatatype);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_ENUM: {

-			VirtualEnum virtualEnum = (VirtualEnum) theEObject;

-			T result = caseVirtualEnum(virtualEnum);

-			if (result == null) {

-				result = caseVirtualClassifier(virtualEnum);

-			}

-			if (result == null) {

-				result = caseVirtualElement(virtualEnum);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_LITERAL: {

-			VirtualLiteral virtualLiteral = (VirtualLiteral) theEObject;

-			T result = caseVirtualLiteral(virtualLiteral);

-			if (result == null) {

-				result = caseVirtualElement(virtualLiteral);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT: {

-			VirtualTypedElement virtualTypedElement = (VirtualTypedElement) theEObject;

-			T result = caseVirtualTypedElement(virtualTypedElement);

-			if (result == null) {

-				result = caseVirtualElement(virtualTypedElement);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Metamodel</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Metamodel</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualMetamodel(VirtualMetamodel object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualElement(VirtualElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Classifier</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Classifier</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualClassifier(VirtualClassifier object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Metaclass</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Metaclass</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualMetaclass(VirtualMetaclass object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Property</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Property</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualProperty(VirtualProperty object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Operation</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Operation</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualOperation(VirtualOperation object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Parameter</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Parameter</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualParameter(VirtualParameter object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Datatype</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Datatype</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualDatatype(VirtualDatatype object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Enum</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Enum</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualEnum(VirtualEnum object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Literal</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Literal</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualLiteral(VirtualLiteral object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Virtual Typed Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Virtual Typed Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseVirtualTypedElement(VirtualTypedElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // VirtualmetamodelSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java
deleted file mode 100644
index 9df36999308..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class VirtualmetamodelXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public VirtualmetamodelXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		VirtualmetamodelPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the VirtualmetamodelResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new VirtualmetamodelResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new VirtualmetamodelResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // VirtualmetamodelXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java
deleted file mode 100644
index 598deb12159..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualClassifierValidator {

-	boolean validate();

-

-	boolean validateMetamodel(VirtualMetamodel value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java
deleted file mode 100644
index 90942d2157c..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualDatatypeValidator {

-	boolean validate();

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java
deleted file mode 100644
index bce4a7a0cf5..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualElementValidator {

-	boolean validate();

-

-	boolean validateAliasName(String value);

-

-	boolean validateKept(boolean value);

-

-	boolean validateRepresentedElement(EObject value);

-

-	boolean validateUseRepresented(boolean value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java
deleted file mode 100644
index 5847af8c050..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualEnumValidator {

-	boolean validate();

-

-	boolean validateLiterals(EList<VirtualLiteral> value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java
deleted file mode 100644
index a99b945c0ee..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualLiteralValidator {

-	boolean validate();

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java
deleted file mode 100644
index 6c78318fde9..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualMetaclassValidator {

-	boolean validate();

-

-	boolean validateAbstract(boolean value);

-

-	boolean validateAppliedStereotypes(EList<BaseMetaclass> value);

-

-	boolean validateOperations(EList<VirtualOperation> value);

-

-	boolean validateParents(EList<VirtualMetaclass> value);

-

-	boolean validateProperties(EList<VirtualProperty> value);

-

-	boolean validateStereotypeInterface(boolean value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java
deleted file mode 100644
index b5f63319296..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.Facade;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualMetamodelValidator {

-	boolean validate();

-

-	boolean validateName(String value);

-

-	boolean validateNsPrefix(String value);

-

-	boolean validateNsURI(String value);

-

-	boolean validateVirtualClassifiers(EList<VirtualClassifier> value);

-

-	boolean validateFacade(Facade value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java
deleted file mode 100644
index 4b70a049859..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualOperationValidator {

-	boolean validate();

-

-	boolean validateParameters(EList<VirtualParameter> value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java
deleted file mode 100644
index a8f696a9fac..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualParameterValidator {

-	boolean validate();

-

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java
deleted file mode 100644
index 1f77681e3cc..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualPropertyValidator {

-	boolean validate();

-

-	boolean validateVirtualMetaclass(VirtualMetaclass value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java
deleted file mode 100644
index 83c9540f86d..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facade.virtualmetamodel.validation;

-

-import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

-

-/**

- * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement}.

- * This doesn't really do anything, and it's not a real EMF artifact.

- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

- */

-public interface VirtualTypedElementValidator {

-	boolean validate();

-

-	boolean validateLower(int value);

-

-	boolean validateUpper(int value);

-

-	boolean validateType(VirtualClassifier value);

-}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java
deleted file mode 100644
index 95467827b33..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Extension Definition Kind</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getExtensionDefinitionKind()

- * @model

- * @generated

- */

-public enum ExtensionDefinitionKind implements Enumerator {

-	/**

-	 * The '<em><b>Association</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #ASSOCIATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ASSOCIATION(0, "Association", "Association"),

-

-	/**

-	 * The '<em><b>Generalization</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #GENERALIZATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	GENERALIZATION(1, "Generalization", "Generalization"),

-

-	/**

-	 * The '<em><b>Multi Generalization</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #MULTI_GENERALIZATION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	MULTI_GENERALIZATION(2, "MultiGeneralization", "MultiGeneralization"),

-

-	/**

-	 * The '<em><b>Fusion</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FUSION_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	FUSION(3, "Fusion", "Fusion");

-

-	/**

-	 * The '<em><b>Association</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Association</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #ASSOCIATION

-	 * @model name="Association"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ASSOCIATION_VALUE = 0;

-

-	/**

-	 * The '<em><b>Generalization</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Generalization</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #GENERALIZATION

-	 * @model name="Generalization"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int GENERALIZATION_VALUE = 1;

-

-	/**

-	 * The '<em><b>Multi Generalization</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Multi Generalization</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #MULTI_GENERALIZATION

-	 * @model name="MultiGeneralization"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int MULTI_GENERALIZATION_VALUE = 2;

-

-	/**

-	 * The '<em><b>Fusion</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Fusion</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #FUSION

-	 * @model name="Fusion"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int FUSION_VALUE = 3;

-

-	/**

-	 * An array of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static final ExtensionDefinitionKind[] VALUES_ARRAY =

-			new ExtensionDefinitionKind[] {

-					ASSOCIATION,

-					GENERALIZATION,

-					MULTI_GENERALIZATION,

-					FUSION,

-			};

-

-	/**

-	 * A public read-only list of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final List<ExtensionDefinitionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			ExtensionDefinitionKind result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			ExtensionDefinitionKind result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ExtensionDefinitionKind get(int value) {

-		switch (value) {

-		case ASSOCIATION_VALUE:

-			return ASSOCIATION;

-		case GENERALIZATION_VALUE:

-			return GENERALIZATION;

-		case MULTI_GENERALIZATION_VALUE:

-			return MULTI_GENERALIZATION;

-		case FUSION_VALUE:

-			return FUSION;

-		}

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final int value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String name;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private final String literal;

-

-	/**

-	 * Only this class can construct instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private ExtensionDefinitionKind(int value, String name, String literal) {

-		this.value = value;

-		this.name = name;

-		this.literal = literal;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public int getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String getLiteral() {

-		return literal;

-	}

-

-	/**

-	 * Returns the literal value of the enumerator, which is its string representation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		return literal;

-	}

-

-} // ExtensionDefinitionKind

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java
deleted file mode 100644
index 544df3de372..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Facade Mappping</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.FacadeMappping#getMappings <em>Mappings</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getFacadeMappping()

- * @model

- * @generated

- */

-public interface FacadeMappping extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Mappings</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.facademapping.Mapping}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Mappings</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Mappings</em>' containment reference list.

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getFacadeMappping_Mappings()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<Mapping> getMappings();

-

-} // FacadeMappping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java
deleted file mode 100644
index 8e64d774214..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage

- * @generated

- */

-public interface FacademappingFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	FacademappingFactory eINSTANCE = org.eclipse.papyrus.facademapping.impl.FacademappingFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Mapping</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Mapping</em>'.

-	 * @generated

-	 */

-	Mapping createMapping();

-

-	/**

-	 * Returns a new object of class '<em>Stereotyped Mapping</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Stereotyped Mapping</em>'.

-	 * @generated

-	 */

-	StereotypedMapping createStereotypedMapping();

-

-	/**

-	 * Returns a new object of class '<em>Facade Mappping</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Facade Mappping</em>'.

-	 * @generated

-	 */

-	FacadeMappping createFacadeMappping();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	FacademappingPackage getFacademappingPackage();

-

-} // FacademappingFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java
deleted file mode 100644
index 954d236fe58..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingFactory

- * @model kind="package"

- * @generated

- */

-public interface FacademappingPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "facademapping";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/facademapping";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "facademapping";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	FacademappingPackage eINSTANCE = org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.MappingImpl <em>Mapping</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facademapping.impl.MappingImpl

-	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getMapping()

-	 * @generated

-	 */

-	int MAPPING = 0;

-

-	/**

-	 * The feature id for the '<em><b>Uml Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MAPPING__UML_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Specific Domain Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MAPPING__SPECIFIC_DOMAIN_ELEMENT = 1;

-

-	/**

-	 * The number of structural features of the '<em>Mapping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MAPPING_FEATURE_COUNT = 2;

-

-	/**

-	 * The number of operations of the '<em>Mapping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int MAPPING_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl <em>Stereotyped Mapping</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl

-	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getStereotypedMapping()

-	 * @generated

-	 */

-	int STEREOTYPED_MAPPING = 1;

-

-	/**

-	 * The feature id for the '<em><b>Uml Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING__UML_ELEMENT = MAPPING__UML_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Specific Domain Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING__SPECIFIC_DOMAIN_ELEMENT = MAPPING__SPECIFIC_DOMAIN_ELEMENT;

-

-	/**

-	 * The feature id for the '<em><b>Applied Stereotypes</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING__APPLIED_STEREOTYPES = MAPPING_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING__KIND = MAPPING_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Stereotyped Mapping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of operations of the '<em>Stereotyped Mapping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_MAPPING_OPERATION_COUNT = MAPPING_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl <em>Facade Mappping</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl

-	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getFacadeMappping()

-	 * @generated

-	 */

-	int FACADE_MAPPPING = 2;

-

-	/**

-	 * The feature id for the '<em><b>Mappings</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE_MAPPPING__MAPPINGS = 0;

-

-	/**

-	 * The number of structural features of the '<em>Facade Mappping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE_MAPPPING_FEATURE_COUNT = 1;

-

-	/**

-	 * The number of operations of the '<em>Facade Mappping</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FACADE_MAPPPING_OPERATION_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

-	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getExtensionDefinitionKind()

-	 * @generated

-	 */

-	int EXTENSION_DEFINITION_KIND = 3;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.Mapping <em>Mapping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Mapping</em>'.

-	 * @see org.eclipse.papyrus.facademapping.Mapping

-	 * @generated

-	 */

-	EClass getMapping();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Uml Element</em>'.

-	 * @see org.eclipse.papyrus.facademapping.Mapping#getUmlElement()

-	 * @see #getMapping()

-	 * @generated

-	 */

-	EReference getMapping_UmlElement();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference '<em>Specific Domain Element</em>'.

-	 * @see org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement()

-	 * @see #getMapping()

-	 * @generated

-	 */

-	EReference getMapping_SpecificDomainElement();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.StereotypedMapping <em>Stereotyped Mapping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Stereotyped Mapping</em>'.

-	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping

-	 * @generated

-	 */

-	EClass getStereotypedMapping();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes <em>Applied Stereotypes</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the reference list '<em>Applied Stereotypes</em>'.

-	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes()

-	 * @see #getStereotypedMapping()

-	 * @generated

-	 */

-	EReference getStereotypedMapping_AppliedStereotypes();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Kind</em>'.

-	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping#getKind()

-	 * @see #getStereotypedMapping()

-	 * @generated

-	 */

-	EAttribute getStereotypedMapping_Kind();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.FacadeMappping <em>Facade Mappping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Facade Mappping</em>'.

-	 * @see org.eclipse.papyrus.facademapping.FacadeMappping

-	 * @generated

-	 */

-	EClass getFacadeMappping();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facademapping.FacadeMappping#getMappings <em>Mappings</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Mappings</em>'.

-	 * @see org.eclipse.papyrus.facademapping.FacadeMappping#getMappings()

-	 * @see #getFacadeMappping()

-	 * @generated

-	 */

-	EReference getFacadeMappping_Mappings();

-

-	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for enum '<em>Extension Definition Kind</em>'.

-	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

-	 * @generated

-	 */

-	EEnum getExtensionDefinitionKind();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	FacademappingFactory getFacademappingFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.MappingImpl <em>Mapping</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facademapping.impl.MappingImpl

-		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getMapping()

-		 * @generated

-		 */

-		EClass MAPPING = eINSTANCE.getMapping();

-

-		/**

-		 * The meta object literal for the '<em><b>Uml Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MAPPING__UML_ELEMENT = eINSTANCE.getMapping_UmlElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Specific Domain Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference MAPPING__SPECIFIC_DOMAIN_ELEMENT = eINSTANCE.getMapping_SpecificDomainElement();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl <em>Stereotyped Mapping</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl

-		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getStereotypedMapping()

-		 * @generated

-		 */

-		EClass STEREOTYPED_MAPPING = eINSTANCE.getStereotypedMapping();

-

-		/**

-		 * The meta object literal for the '<em><b>Applied Stereotypes</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STEREOTYPED_MAPPING__APPLIED_STEREOTYPES = eINSTANCE.getStereotypedMapping_AppliedStereotypes();

-

-		/**

-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STEREOTYPED_MAPPING__KIND = eINSTANCE.getStereotypedMapping_Kind();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl <em>Facade Mappping</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl

-		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getFacadeMappping()

-		 * @generated

-		 */

-		EClass FACADE_MAPPPING = eINSTANCE.getFacadeMappping();

-

-		/**

-		 * The meta object literal for the '<em><b>Mappings</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FACADE_MAPPPING__MAPPINGS = eINSTANCE.getFacadeMappping_Mappings();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

-		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getExtensionDefinitionKind()

-		 * @generated

-		 */

-		EEnum EXTENSION_DEFINITION_KIND = eINSTANCE.getExtensionDefinitionKind();

-

-	}

-

-} // FacademappingPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java
deleted file mode 100644
index deaa0af2b3e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Mapping</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping()

- * @model

- * @generated

- */

-public interface Mapping extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Uml Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Uml Element</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Uml Element</em>' reference.

-	 * @see #setUmlElement(EObject)

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping_UmlElement()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getUmlElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Uml Element</em>' reference.

-	 * @see #getUmlElement()

-	 * @generated

-	 */

-	void setUmlElement(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Specific Domain Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Specific Domain Element</em>' reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Specific Domain Element</em>' reference.

-	 * @see #setSpecificDomainElement(EObject)

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping_SpecificDomainElement()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getSpecificDomainElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Specific Domain Element</em>' reference.

-	 * @see #getSpecificDomainElement()

-	 * @generated

-	 */

-	void setSpecificDomainElement(EObject value);

-

-} // Mapping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java
deleted file mode 100644
index 813596a851e..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Stereotyped Mapping</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping()

- * @model

- * @generated

- */

-public interface StereotypedMapping extends Mapping {

-	/**

-	 * Returns the value of the '<em><b>Applied Stereotypes</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Applied Stereotypes</em>' reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Applied Stereotypes</em>' reference list.

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping_AppliedStereotypes()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<EObject> getAppliedStereotypes();

-

-	/**

-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

-	 * @see #setKind(ExtensionDefinitionKind)

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping_Kind()

-	 * @model

-	 * @generated

-	 */

-	ExtensionDefinitionKind getKind();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Kind</em>' attribute.

-	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

-	 * @see #getKind()

-	 * @generated

-	 */

-	void setKind(ExtensionDefinitionKind value);

-

-} // StereotypedMapping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java
deleted file mode 100644
index 864970f4980..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Facade Mappping</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl#getMappings <em>Mappings</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FacadeMapppingImpl extends MinimalEObjectImpl.Container implements FacadeMappping {

-	/**

-	 * The cached value of the '{@link #getMappings() <em>Mappings</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getMappings()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Mapping> mappings;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacadeMapppingImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return FacademappingPackage.Literals.FACADE_MAPPPING;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<Mapping> getMappings() {

-		if (mappings == null) {

-			mappings = new EObjectContainmentEList<Mapping>(Mapping.class, this, FacademappingPackage.FACADE_MAPPPING__MAPPINGS);

-		}

-		return mappings;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			return ((InternalEList<?>) getMappings()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			return getMappings();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			getMappings().clear();

-			getMappings().addAll((Collection<? extends Mapping>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			getMappings().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

-			return mappings != null && !mappings.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // FacadeMapppingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java
deleted file mode 100644
index e443bf9bb66..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingFactory;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingFactoryImpl extends EFactoryImpl implements FacademappingFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static FacademappingFactory init() {

-		try {

-			FacademappingFactory theFacademappingFactory = (FacademappingFactory) EPackage.Registry.INSTANCE.getEFactory(FacademappingPackage.eNS_URI);

-			if (theFacademappingFactory != null) {

-				return theFacademappingFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new FacademappingFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case FacademappingPackage.MAPPING:

-			return createMapping();

-		case FacademappingPackage.STEREOTYPED_MAPPING:

-			return createStereotypedMapping();

-		case FacademappingPackage.FACADE_MAPPPING:

-			return createFacadeMappping();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch (eDataType.getClassifierID()) {

-		case FacademappingPackage.EXTENSION_DEFINITION_KIND:

-			return createExtensionDefinitionKindFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch (eDataType.getClassifierID()) {

-		case FacademappingPackage.EXTENSION_DEFINITION_KIND:

-			return convertExtensionDefinitionKindToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Mapping createMapping() {

-		MappingImpl mapping = new MappingImpl();

-		return mapping;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public StereotypedMapping createStereotypedMapping() {

-		StereotypedMappingImpl stereotypedMapping = new StereotypedMappingImpl();

-		return stereotypedMapping;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FacadeMappping createFacadeMappping() {

-		FacadeMapppingImpl facadeMappping = new FacadeMapppingImpl();

-		return facadeMappping;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ExtensionDefinitionKind createExtensionDefinitionKindFromString(EDataType eDataType, String initialValue) {

-		ExtensionDefinitionKind result = ExtensionDefinitionKind.get(initialValue);

-		if (result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

-		}

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String convertExtensionDefinitionKindToString(EDataType eDataType, Object instanceValue) {

-		return instanceValue == null ? null : instanceValue.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FacademappingPackage getFacademappingPackage() {

-		return (FacademappingPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static FacademappingPackage getPackage() {

-		return FacademappingPackage.eINSTANCE;

-	}

-

-} // FacademappingFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java
deleted file mode 100644
index 1c1c1cb13eb..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingFactory;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class FacademappingPackageImpl extends EPackageImpl implements FacademappingPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass mappingEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stereotypedMappingEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass facadeMapppingEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EEnum extensionDefinitionKindEEnum = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private FacademappingPackageImpl() {

-		super(eNS_URI, FacademappingFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link FacademappingPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static FacademappingPackage init() {

-		if (isInited) {

-			return (FacademappingPackage) EPackage.Registry.INSTANCE.getEPackage(FacademappingPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		FacademappingPackageImpl theFacademappingPackage = (FacademappingPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FacademappingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FacademappingPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theFacademappingPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theFacademappingPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theFacademappingPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(FacademappingPackage.eNS_URI, theFacademappingPackage);

-		return theFacademappingPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getMapping() {

-		return mappingEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getMapping_UmlElement() {

-		return (EReference) mappingEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getMapping_SpecificDomainElement() {

-		return (EReference) mappingEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getStereotypedMapping() {

-		return stereotypedMappingEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getStereotypedMapping_AppliedStereotypes() {

-		return (EReference) stereotypedMappingEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EAttribute getStereotypedMapping_Kind() {

-		return (EAttribute) stereotypedMappingEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EClass getFacadeMappping() {

-		return facadeMapppingEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EReference getFacadeMappping_Mappings() {

-		return (EReference) facadeMapppingEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EEnum getExtensionDefinitionKind() {

-		return extensionDefinitionKindEEnum;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public FacademappingFactory getFacademappingFactory() {

-		return (FacademappingFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		mappingEClass = createEClass(MAPPING);

-		createEReference(mappingEClass, MAPPING__UML_ELEMENT);

-		createEReference(mappingEClass, MAPPING__SPECIFIC_DOMAIN_ELEMENT);

-

-		stereotypedMappingEClass = createEClass(STEREOTYPED_MAPPING);

-		createEReference(stereotypedMappingEClass, STEREOTYPED_MAPPING__APPLIED_STEREOTYPES);

-		createEAttribute(stereotypedMappingEClass, STEREOTYPED_MAPPING__KIND);

-

-		facadeMapppingEClass = createEClass(FACADE_MAPPPING);

-		createEReference(facadeMapppingEClass, FACADE_MAPPPING__MAPPINGS);

-

-		// Create enums

-		extensionDefinitionKindEEnum = createEEnum(EXTENSION_DEFINITION_KIND);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		stereotypedMappingEClass.getESuperTypes().add(this.getMapping());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(mappingEClass, Mapping.class, "Mapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getMapping_UmlElement(), ecorePackage.getEObject(), null, "umlElement", null, 1, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getMapping_SpecificDomainElement(), ecorePackage.getEObject(), null, "specificDomainElement", null, 1, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(stereotypedMappingEClass, StereotypedMapping.class, "StereotypedMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getStereotypedMapping_AppliedStereotypes(), ecorePackage.getEObject(), null, "appliedStereotypes", null, 1, -1, StereotypedMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,

-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getStereotypedMapping_Kind(), this.getExtensionDefinitionKind(), "kind", null, 0, 1, StereotypedMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(facadeMapppingEClass, FacadeMappping.class, "FacadeMappping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getFacadeMappping_Mappings(), this.getMapping(), null, "mappings", null, 0, -1, FacadeMappping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Initialize enums and add enum literals

-		initEEnum(extensionDefinitionKindEEnum, ExtensionDefinitionKind.class, "ExtensionDefinitionKind");

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.ASSOCIATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.GENERALIZATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.MULTI_GENERALIZATION);

-		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.FUSION);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // FacademappingPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java
deleted file mode 100644
index 0f46ad46bc4..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Mapping</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.impl.MappingImpl#getUmlElement <em>Uml Element</em>}</li>

- * <li>{@link org.eclipse.papyrus.facademapping.impl.MappingImpl#getSpecificDomainElement <em>Specific Domain Element</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class MappingImpl extends MinimalEObjectImpl.Container implements Mapping {

-	/**

-	 * The cached value of the '{@link #getUmlElement() <em>Uml Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getUmlElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject umlElement;

-

-	/**

-	 * The cached value of the '{@link #getSpecificDomainElement() <em>Specific Domain Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getSpecificDomainElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject specificDomainElement;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected MappingImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return FacademappingPackage.Literals.MAPPING;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject getUmlElement() {

-		if (umlElement != null && umlElement.eIsProxy()) {

-			InternalEObject oldUmlElement = (InternalEObject) umlElement;

-			umlElement = eResolveProxy(oldUmlElement);

-			if (umlElement != oldUmlElement) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FacademappingPackage.MAPPING__UML_ELEMENT, oldUmlElement, umlElement));

-				}

-			}

-		}

-		return umlElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetUmlElement() {

-		return umlElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setUmlElement(EObject newUmlElement) {

-		EObject oldUmlElement = umlElement;

-		umlElement = newUmlElement;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.MAPPING__UML_ELEMENT, oldUmlElement, umlElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject getSpecificDomainElement() {

-		if (specificDomainElement != null && specificDomainElement.eIsProxy()) {

-			InternalEObject oldSpecificDomainElement = (InternalEObject) specificDomainElement;

-			specificDomainElement = eResolveProxy(oldSpecificDomainElement);

-			if (specificDomainElement != oldSpecificDomainElement) {

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT, oldSpecificDomainElement, specificDomainElement));

-				}

-			}

-		}

-		return specificDomainElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EObject basicGetSpecificDomainElement() {

-		return specificDomainElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setSpecificDomainElement(EObject newSpecificDomainElement) {

-		EObject oldSpecificDomainElement = specificDomainElement;

-		specificDomainElement = newSpecificDomainElement;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT, oldSpecificDomainElement, specificDomainElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case FacademappingPackage.MAPPING__UML_ELEMENT:

-			if (resolve) {

-				return getUmlElement();

-			}

-			return basicGetUmlElement();

-		case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

-			if (resolve) {

-				return getSpecificDomainElement();

-			}

-			return basicGetSpecificDomainElement();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case FacademappingPackage.MAPPING__UML_ELEMENT:

-			setUmlElement((EObject) newValue);

-			return;

-		case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

-			setSpecificDomainElement((EObject) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.MAPPING__UML_ELEMENT:

-			setUmlElement((EObject) null);

-			return;

-		case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

-			setSpecificDomainElement((EObject) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.MAPPING__UML_ELEMENT:

-			return umlElement != null;

-		case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

-			return specificDomainElement != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // MappingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java
deleted file mode 100644
index 248873f9cda..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Stereotyped Mapping</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

- * <li>{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl#getKind <em>Kind</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StereotypedMappingImpl extends MappingImpl implements StereotypedMapping {

-	/**

-	 * The cached value of the '{@link #getAppliedStereotypes() <em>Applied Stereotypes</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getAppliedStereotypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<EObject> appliedStereotypes;

-

-	/**

-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKind()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final ExtensionDefinitionKind KIND_EDEFAULT = ExtensionDefinitionKind.ASSOCIATION;

-

-	/**

-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getKind()

-	 * @generated

-	 * @ordered

-	 */

-	protected ExtensionDefinitionKind kind = KIND_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StereotypedMappingImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return FacademappingPackage.Literals.STEREOTYPED_MAPPING;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EList<EObject> getAppliedStereotypes() {

-		if (appliedStereotypes == null) {

-			appliedStereotypes = new EObjectResolvingEList<EObject>(EObject.class, this, FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES);

-		}

-		return appliedStereotypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public ExtensionDefinitionKind getKind() {

-		return kind;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void setKind(ExtensionDefinitionKind newKind) {

-		ExtensionDefinitionKind oldKind = kind;

-		kind = newKind == null ? KIND_EDEFAULT : newKind;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.STEREOTYPED_MAPPING__KIND, oldKind, kind));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

-			return getAppliedStereotypes();

-		case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

-			return getKind();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

-			getAppliedStereotypes().clear();

-			getAppliedStereotypes().addAll((Collection<? extends EObject>) newValue);

-			return;

-		case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

-			setKind((ExtensionDefinitionKind) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

-			getAppliedStereotypes().clear();

-			return;

-		case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

-			setKind(KIND_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

-			return appliedStereotypes != null && !appliedStereotypes.isEmpty();

-		case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

-			return kind != KIND_EDEFAULT;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (kind: ");

-		result.append(kind);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StereotypedMappingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java
deleted file mode 100644
index 536d3e5a5bd..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage

- * @generated

- */

-public class FacademappingAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static FacademappingPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = FacademappingPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FacademappingSwitch<Adapter> modelSwitch =

-			new FacademappingSwitch<Adapter>() {

-				@Override

-				public Adapter caseMapping(Mapping object) {

-					return createMappingAdapter();

-				}

-

-				@Override

-				public Adapter caseStereotypedMapping(StereotypedMapping object) {

-					return createStereotypedMappingAdapter();

-				}

-

-				@Override

-				public Adapter caseFacadeMappping(FacadeMappping object) {

-					return createFacadeMapppingAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.Mapping <em>Mapping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facademapping.Mapping

-	 * @generated

-	 */

-	public Adapter createMappingAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.StereotypedMapping <em>Stereotyped Mapping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping

-	 * @generated

-	 */

-	public Adapter createStereotypedMappingAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.FacadeMappping <em>Facade Mappping</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.facademapping.FacadeMappping

-	 * @generated

-	 */

-	public Adapter createFacadeMapppingAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // FacademappingAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java
deleted file mode 100644
index 742898a69a7..00000000000
--- a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.facademapping.util;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.facademapping.FacadeMappping;

-import org.eclipse.papyrus.facademapping.FacademappingPackage;

-import org.eclipse.papyrus.facademapping.Mapping;

-import org.eclipse.papyrus.facademapping.StereotypedMapping;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.facademapping.FacademappingPackage

- * @generated

- */

-public class FacademappingSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static FacademappingPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FacademappingSwitch() {

-		if (modelPackage == null) {

-			modelPackage = FacademappingPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case FacademappingPackage.MAPPING: {

-			Mapping mapping = (Mapping) theEObject;

-			T result = caseMapping(mapping);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case FacademappingPackage.STEREOTYPED_MAPPING: {

-			StereotypedMapping stereotypedMapping = (StereotypedMapping) theEObject;

-			T result = caseStereotypedMapping(stereotypedMapping);

-			if (result == null) {

-				result = caseMapping(stereotypedMapping);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case FacademappingPackage.FACADE_MAPPPING: {

-			FacadeMappping facadeMappping = (FacadeMappping) theEObject;

-			T result = caseFacadeMappping(facadeMappping);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Mapping</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Mapping</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMapping(Mapping object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stereotyped Mapping</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Stereotyped Mapping</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStereotypedMapping(StereotypedMapping object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Facade Mappping</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Facade Mappping</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFacadeMappping(FacadeMappping object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // FacademappingSwitch