Bug 553247: [Xtext][Properties] improve the loading of LanguageEditor

	- add a field bundleId to the Editor EClass provided by the model languagePreference
	- use this new field to instanciate the editor with the right bundle

Change-Id: I13e2d07fd0d904874894dee9db584abc674a88c2
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>

21 files changed, 360 insertions, 403 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index eb1e704ebaa..61319541f08 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)
  org.apache.commons.io;bundle-version="2.2.0"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.100.qualifier
 Eclipse-BuddyPolicy: dependent
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
index 028c4f3c61b..bd768cfafd8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/pom.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
@@ -6,6 +9,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.tools</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
index 0e6041f0cc9..7c92c2d3d55 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
@@ -11,6 +11,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  EclipseSource - Bug 543723
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 553247
  *****************************************************************************/
 package org.eclipse.papyrus.infra.tools.util;
 
@@ -193,6 +194,10 @@ public class ClassLoaderHelper {
 	 * @since 3.1
 	 */
 	public static <T> Class<? extends T> loadClass(String className, Class<T> asSubClass, String bundleId) {
+		Class<?> clazz = classes.get(className);
+		if (clazz != null) {
+			return clazz.asSubclass(asSubClass);// to avoid to load the bundle when it is not required
+		}
 		return loadClass(className, asSubClass, bundleId == null ? null : Platform.getBundle(bundleId));
 	}
 
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index a2145a130c0..4570bc0a969 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -41,8 +41,9 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)";v
  org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints"
-Bundle-Version: 3.5.0.qualifier
+Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.properties.constraints
+Bundle-Version: 3.5.100.qualifier
+Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.papyrus.uml.properties.Activator
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.ecore b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.ecore
index 0567af27079..f15dd51446b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.ecore
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.ecore
@@ -1,14 +1,14 @@
 <?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="languagepreferences"
-    nsURI="http://www.eclipse.org/papyrus/properties/uml/languagePreferences" nsPrefix="lgpref">
+<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="languagepreferences" nsURI="http://www.eclipse.org/papyrus/properties/uml/languagePreferences"
+    nsPrefix="lgpref">
   <eClassifiers xsi:type="ecore:EClass" name="Language">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="preferedEditor" eType="#//Editor"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Editor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Preferences">
     <eStructuralFeatures xsi:type="ecore:EReference" name="languages" upperBound="-1"
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.genmodel b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.genmodel
index 69cd3fbe89a..ee4178c36b7 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.genmodel
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/LanguagePreferences.genmodel
@@ -3,7 +3,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 CEA LIST and others.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; Camille Letavernier - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.uml.properties/src-gen" editDirectory="/org.eclipse.papyrus.uml.properties.edit/src-gen"
     editorDirectory="/org.eclipse.papyrus.uml.properties.editor/src-gen" modelPluginID="org.eclipse.papyrus.uml.properties"
-    modelName="LanguagePreferences" testsDirectory="/org.eclipse.papyrus.uml.properties.tests/src-gen"
+    modelName="LanguagePreferences" nonNLSMarkers="true" testsDirectory="/org.eclipse.papyrus.uml.properties.tests/src-gen"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
   <foreignModel>LanguagePreferences.ecore</foreignModel>
   <genPackages prefix="languagepreferences" basePackage="org.eclipse.papyrus.uml.properties"
@@ -14,6 +14,7 @@
     </genClasses>
     <genClasses ecoreClass="LanguagePreferences.ecore#//Editor">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute LanguagePreferences.ecore#//Editor/class"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute LanguagePreferences.ecore#//Editor/bundleId"/>
     </genClasses>
     <genClasses ecoreClass="LanguagePreferences.ecore#//Preferences">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference LanguagePreferences.ecore#//Preferences/languages"/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
index 2b71f0e47ef..d23fa150c8a 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-properties</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.uml-properties</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.properties</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Editor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Editor.java
index 41aa5e9531b..56ec0528125 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Editor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Editor.java
@@ -15,10 +15,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getBundleId <em>Bundle Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getEditor()
  * @model
@@ -32,7 +33,6 @@ public interface Editor extends EObject {
 	 * If the meaning of the '<em>Class</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Class</em>' attribute.
 	 * @see #setClass(String)
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getEditor_Class()
@@ -45,12 +45,32 @@ public interface Editor extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getClass_ <em>Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Class</em>' attribute.
+	 * @param value the new value of the '<em>Class</em>' attribute.
 	 * @see #getClass_()
 	 * @generated
 	 */
 	void setClass(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Bundle Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Bundle Id</em>' attribute.
+	 * @see #setBundleId(String)
+	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getEditor_BundleId()
+	 * @model
+	 * @generated
+	 */
+	String getBundleId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getBundleId <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bundle Id</em>' attribute.
+	 * @see #getBundleId()
+	 * @generated
+	 */
+	void setBundleId(String value);
+
 } // Editor
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Language.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Language.java
index bf2d24bd671..7b05e03f131 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Language.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Language.java
@@ -15,11 +15,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getPreferedEditor <em>Prefered Editor</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getPreferedEditor <em>Prefered Editor</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getLanguage()
  * @model
@@ -33,7 +33,6 @@ public interface Language extends EObject {
 	 * 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.uml.properties.languagepreferences.languagepreferencesPackage#getLanguage_Name()
@@ -46,9 +45,7 @@ public interface Language extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Name</em>' attribute.
+	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
@@ -61,7 +58,6 @@ public interface Language extends EObject {
 	 * If the meaning of the '<em>Prefered Editor</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Prefered Editor</em>' reference.
 	 * @see #setPreferedEditor(Editor)
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getLanguage_PreferedEditor()
@@ -74,9 +70,7 @@ public interface Language extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getPreferedEditor <em>Prefered Editor</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Prefered Editor</em>' reference.
+	 * @param value the new value of the '<em>Prefered Editor</em>' reference.
 	 * @see #getPreferedEditor()
 	 * @generated
 	 */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Preferences.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Preferences.java
index b92bb2da7ef..9b36a0c23e5 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Preferences.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/Preferences.java
@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getLanguages <em>Languages</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getEditors <em>Editors</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getDefaultEditor <em>Default Editor</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getLanguages <em>Languages</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getEditors <em>Editors</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getDefaultEditor <em>Default Editor</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getPreferences()
  * @model
@@ -36,7 +36,6 @@ public interface Preferences extends EObject {
 	 * If the meaning of the '<em>Languages</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>Languages</em>' containment reference list.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getPreferences_Languages()
 	 * @model containment="true"
@@ -52,7 +51,6 @@ public interface Preferences extends EObject {
 	 * If the meaning of the '<em>Editors</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>Editors</em>' containment reference list.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getPreferences_Editors()
 	 * @model containment="true"
@@ -67,7 +65,6 @@ public interface Preferences extends EObject {
 	 * If the meaning of the '<em>Default Editor</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Default Editor</em>' reference.
 	 * @see #setDefaultEditor(Editor)
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage#getPreferences_DefaultEditor()
@@ -80,9 +77,7 @@ public interface Preferences extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getDefaultEditor <em>Default Editor</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Default Editor</em>' reference.
+	 * @param value the new value of the '<em>Default Editor</em>' reference.
 	 * @see #getDefaultEditor()
 	 * @generated
 	 */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/EditorImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/EditorImpl.java
index a940ec35cd3..42955ae07f8 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/EditorImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/EditorImpl.java
@@ -19,10 +19,11 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl#getClass_ <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl#getBundleId <em>Bundle Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -31,7 +32,6 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -42,7 +42,6 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getClass_()
 	 * @generated
 	 * @ordered
@@ -50,9 +49,28 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	protected String class_ = CLASS_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBundleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BUNDLE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBundleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String bundleId = BUNDLE_ID_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected EditorImpl() {
@@ -62,7 +80,6 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -73,7 +90,6 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public String getClass_() {
@@ -83,28 +99,48 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setClass(String newClass) {
 		String oldClass = class_;
 		class_ = newClass;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, languagepreferencesPackage.EDITOR__CLASS, oldClass, class_));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * @generated
+	 */
+	public String getBundleId() {
+		return bundleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBundleId(String newBundleId) {
+		String oldBundleId = bundleId;
+		bundleId = newBundleId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, languagepreferencesPackage.EDITOR__BUNDLE_ID, oldBundleId, bundleId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case languagepreferencesPackage.EDITOR__CLASS:
-			return getClass_();
+			case languagepreferencesPackage.EDITOR__CLASS:
+				return getClass_();
+			case languagepreferencesPackage.EDITOR__BUNDLE_ID:
+				return getBundleId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -112,15 +148,17 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case languagepreferencesPackage.EDITOR__CLASS:
-			setClass((String) newValue);
-			return;
+			case languagepreferencesPackage.EDITOR__CLASS:
+				setClass((String)newValue);
+				return;
+			case languagepreferencesPackage.EDITOR__BUNDLE_ID:
+				setBundleId((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -128,15 +166,17 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.EDITOR__CLASS:
-			setClass(CLASS_EDEFAULT);
-			return;
+			case languagepreferencesPackage.EDITOR__CLASS:
+				setClass(CLASS_EDEFAULT);
+				return;
+			case languagepreferencesPackage.EDITOR__BUNDLE_ID:
+				setBundleId(BUNDLE_ID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -144,14 +184,15 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.EDITOR__CLASS:
-			return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+			case languagepreferencesPackage.EDITOR__CLASS:
+				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
+			case languagepreferencesPackage.EDITOR__BUNDLE_ID:
+				return BUNDLE_ID_EDEFAULT == null ? bundleId != null : !BUNDLE_ID_EDEFAULT.equals(bundleId);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -159,18 +200,17 @@ public class EditorImpl extends EObjectImpl implements Editor {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (class: ");
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (class: "); //$NON-NLS-1$
 		result.append(class_);
+		result.append(", bundleId: "); //$NON-NLS-1$
+		result.append(bundleId);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/LanguageImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/LanguageImpl.java
index 2699df15d02..d3fc8fab4e0 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/LanguageImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/LanguageImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl#getPreferedEditor <em>Prefered Editor</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl#getPreferedEditor <em>Prefered Editor</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -34,7 +34,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -45,7 +44,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -56,7 +54,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	 * The cached value of the '{@link #getPreferedEditor() <em>Prefered Editor</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getPreferedEditor()
 	 * @generated
 	 * @ordered
@@ -66,7 +63,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected LanguageImpl() {
@@ -76,7 +72,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -87,7 +82,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public String getName() {
@@ -97,31 +91,27 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, languagepreferencesPackage.LANGUAGE__NAME, oldName, name));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Editor getPreferedEditor() {
 		if (preferedEditor != null && preferedEditor.eIsProxy()) {
-			InternalEObject oldPreferedEditor = (InternalEObject) preferedEditor;
-			preferedEditor = (Editor) eResolveProxy(oldPreferedEditor);
+			InternalEObject oldPreferedEditor = (InternalEObject)preferedEditor;
+			preferedEditor = (Editor)eResolveProxy(oldPreferedEditor);
 			if (preferedEditor != oldPreferedEditor) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR, oldPreferedEditor, preferedEditor));
-				}
 			}
 		}
 		return preferedEditor;
@@ -130,7 +120,6 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Editor basicGetPreferedEditor() {
@@ -140,33 +129,28 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setPreferedEditor(Editor newPreferedEditor) {
 		Editor oldPreferedEditor = preferedEditor;
 		preferedEditor = newPreferedEditor;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR, oldPreferedEditor, preferedEditor));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case languagepreferencesPackage.LANGUAGE__NAME:
-			return getName();
-		case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
-			if (resolve) {
-				return getPreferedEditor();
-			}
-			return basicGetPreferedEditor();
+			case languagepreferencesPackage.LANGUAGE__NAME:
+				return getName();
+			case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
+				if (resolve) return getPreferedEditor();
+				return basicGetPreferedEditor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -174,18 +158,17 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case languagepreferencesPackage.LANGUAGE__NAME:
-			setName((String) newValue);
-			return;
-		case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
-			setPreferedEditor((Editor) newValue);
-			return;
+			case languagepreferencesPackage.LANGUAGE__NAME:
+				setName((String)newValue);
+				return;
+			case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
+				setPreferedEditor((Editor)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -193,18 +176,17 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.LANGUAGE__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
-			setPreferedEditor((Editor) null);
-			return;
+			case languagepreferencesPackage.LANGUAGE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
+				setPreferedEditor((Editor)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,16 +194,15 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.LANGUAGE__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
-			return preferedEditor != null;
+			case languagepreferencesPackage.LANGUAGE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case languagepreferencesPackage.LANGUAGE__PREFERED_EDITOR:
+				return preferedEditor != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -229,17 +210,14 @@ public class LanguageImpl extends EObjectImpl implements Language {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
+		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(')');
 		return result.toString();
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/PreferencesImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/PreferencesImpl.java
index 12dd7bd325e..cac90f36ed3 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/PreferencesImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/PreferencesImpl.java
@@ -28,12 +28,12 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getLanguages <em>Languages</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getEditors <em>Editors</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getDefaultEditor <em>Default Editor</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getLanguages <em>Languages</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getEditors <em>Editors</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl#getDefaultEditor <em>Default Editor</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -42,7 +42,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	 * The cached value of the '{@link #getLanguages() <em>Languages</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getLanguages()
 	 * @generated
 	 * @ordered
@@ -53,7 +52,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	 * The cached value of the '{@link #getEditors() <em>Editors</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getEditors()
 	 * @generated
 	 * @ordered
@@ -64,7 +62,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	 * The cached value of the '{@link #getDefaultEditor() <em>Default Editor</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getDefaultEditor()
 	 * @generated
 	 * @ordered
@@ -74,7 +71,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected PreferencesImpl() {
@@ -84,7 +80,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -95,7 +90,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EList<Language> getLanguages() {
@@ -108,7 +102,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EList<Editor> getEditors() {
@@ -121,17 +114,15 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Editor getDefaultEditor() {
 		if (defaultEditor != null && defaultEditor.eIsProxy()) {
-			InternalEObject oldDefaultEditor = (InternalEObject) defaultEditor;
-			defaultEditor = (Editor) eResolveProxy(oldDefaultEditor);
+			InternalEObject oldDefaultEditor = (InternalEObject)defaultEditor;
+			defaultEditor = (Editor)eResolveProxy(oldDefaultEditor);
 			if (defaultEditor != oldDefaultEditor) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR, oldDefaultEditor, defaultEditor));
-				}
 			}
 		}
 		return defaultEditor;
@@ -140,7 +131,6 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Editor basicGetDefaultEditor() {
@@ -150,30 +140,27 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public void setDefaultEditor(Editor newDefaultEditor) {
 		Editor oldDefaultEditor = defaultEditor;
 		defaultEditor = newDefaultEditor;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR, oldDefaultEditor, defaultEditor));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case languagepreferencesPackage.PREFERENCES__LANGUAGES:
-			return ((InternalEList<?>) getLanguages()).basicRemove(otherEnd, msgs);
-		case languagepreferencesPackage.PREFERENCES__EDITORS:
-			return ((InternalEList<?>) getEditors()).basicRemove(otherEnd, msgs);
+			case languagepreferencesPackage.PREFERENCES__LANGUAGES:
+				return ((InternalEList<?>)getLanguages()).basicRemove(otherEnd, msgs);
+			case languagepreferencesPackage.PREFERENCES__EDITORS:
+				return ((InternalEList<?>)getEditors()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -181,21 +168,18 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case languagepreferencesPackage.PREFERENCES__LANGUAGES:
-			return getLanguages();
-		case languagepreferencesPackage.PREFERENCES__EDITORS:
-			return getEditors();
-		case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
-			if (resolve) {
-				return getDefaultEditor();
-			}
-			return basicGetDefaultEditor();
+			case languagepreferencesPackage.PREFERENCES__LANGUAGES:
+				return getLanguages();
+			case languagepreferencesPackage.PREFERENCES__EDITORS:
+				return getEditors();
+			case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
+				if (resolve) return getDefaultEditor();
+				return basicGetDefaultEditor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -203,24 +187,23 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case languagepreferencesPackage.PREFERENCES__LANGUAGES:
-			getLanguages().clear();
-			getLanguages().addAll((Collection<? extends Language>) newValue);
-			return;
-		case languagepreferencesPackage.PREFERENCES__EDITORS:
-			getEditors().clear();
-			getEditors().addAll((Collection<? extends Editor>) newValue);
-			return;
-		case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
-			setDefaultEditor((Editor) newValue);
-			return;
+			case languagepreferencesPackage.PREFERENCES__LANGUAGES:
+				getLanguages().clear();
+				getLanguages().addAll((Collection<? extends Language>)newValue);
+				return;
+			case languagepreferencesPackage.PREFERENCES__EDITORS:
+				getEditors().clear();
+				getEditors().addAll((Collection<? extends Editor>)newValue);
+				return;
+			case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
+				setDefaultEditor((Editor)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -228,21 +211,20 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.PREFERENCES__LANGUAGES:
-			getLanguages().clear();
-			return;
-		case languagepreferencesPackage.PREFERENCES__EDITORS:
-			getEditors().clear();
-			return;
-		case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
-			setDefaultEditor((Editor) null);
-			return;
+			case languagepreferencesPackage.PREFERENCES__LANGUAGES:
+				getLanguages().clear();
+				return;
+			case languagepreferencesPackage.PREFERENCES__EDITORS:
+				getEditors().clear();
+				return;
+			case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
+				setDefaultEditor((Editor)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -250,18 +232,17 @@ public class PreferencesImpl extends EObjectImpl implements Preferences {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case languagepreferencesPackage.PREFERENCES__LANGUAGES:
-			return languages != null && !languages.isEmpty();
-		case languagepreferencesPackage.PREFERENCES__EDITORS:
-			return editors != null && !editors.isEmpty();
-		case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
-			return defaultEditor != null;
+			case languagepreferencesPackage.PREFERENCES__LANGUAGES:
+				return languages != null && !languages.isEmpty();
+			case languagepreferencesPackage.PREFERENCES__EDITORS:
+				return editors != null && !editors.isEmpty();
+			case languagepreferencesPackage.PREFERENCES__DEFAULT_EDITOR:
+				return defaultEditor != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesFactoryImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesFactoryImpl.java
index 97588d5fdb0..ffede2a1eaa 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesFactoryImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesFactoryImpl.java
@@ -11,6 +11,7 @@ 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.uml.properties.languagepreferences.*;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Editor;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Language;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Preferences;
@@ -21,7 +22,6 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class languagepreferencesFactoryImpl extends EFactoryImpl implements languagepreferencesFactory {
@@ -29,16 +29,16 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public static languagepreferencesFactory init() {
 		try {
-			languagepreferencesFactory thelanguagepreferencesFactory = (languagepreferencesFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/properties/uml/languagePreferences");
+			languagepreferencesFactory thelanguagepreferencesFactory = (languagepreferencesFactory)EPackage.Registry.INSTANCE.getEFactory(languagepreferencesPackage.eNS_URI);
 			if (thelanguagepreferencesFactory != null) {
 				return thelanguagepreferencesFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new languagepreferencesFactoryImpl();
@@ -48,7 +48,6 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public languagepreferencesFactoryImpl() {
@@ -58,27 +57,22 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case languagepreferencesPackage.LANGUAGE:
-			return createLanguage();
-		case languagepreferencesPackage.EDITOR:
-			return createEditor();
-		case languagepreferencesPackage.PREFERENCES:
-			return createPreferences();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+			case languagepreferencesPackage.LANGUAGE: return createLanguage();
+			case languagepreferencesPackage.EDITOR: return createEditor();
+			case languagepreferencesPackage.PREFERENCES: return createPreferences();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Language createLanguage() {
@@ -89,7 +83,6 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Editor createEditor() {
@@ -100,7 +93,6 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public Preferences createPreferences() {
@@ -111,17 +103,15 @@ public class languagepreferencesFactoryImpl extends EFactoryImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public languagepreferencesPackage getlanguagepreferencesPackage() {
-		return (languagepreferencesPackage) getEPackage();
+		return (languagepreferencesPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesPackageImpl.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesPackageImpl.java
index 5cc0ac83285..a0e91f2c17f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesPackageImpl.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/impl/languagepreferencesPackageImpl.java
@@ -21,14 +21,12 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class languagepreferencesPackageImpl extends EPackageImpl implements languagepreferencesPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass languageEClass = null;
@@ -36,7 +34,6 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass editorEClass = null;
@@ -44,17 +41,19 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private EClass preferencesEClass = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * 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 -->
-	 *
+	 * <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.uml.properties.languagepreferences.languagepreferencesPackage#eNS_URI
 	 * @see #init()
@@ -67,7 +66,6 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -75,23 +73,21 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * 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 languagepreferencesPackage#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 --> <!--
+	 * <p>This method is used to initialize {@link languagepreferencesPackage#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 languagepreferencesPackage init() {
-		if (isInited) {
-			return (languagepreferencesPackage) EPackage.Registry.INSTANCE.getEPackage(languagepreferencesPackage.eNS_URI);
-		}
+		if (isInited) return (languagepreferencesPackage)EPackage.Registry.INSTANCE.getEPackage(languagepreferencesPackage.eNS_URI);
 
 		// Obtain or create and register package
-		languagepreferencesPackageImpl thelanguagepreferencesPackage = (languagepreferencesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof languagepreferencesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-				: new languagepreferencesPackageImpl());
+		Object registeredlanguagepreferencesPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		languagepreferencesPackageImpl thelanguagepreferencesPackage = registeredlanguagepreferencesPackage instanceof languagepreferencesPackageImpl ? (languagepreferencesPackageImpl)registeredlanguagepreferencesPackage : new languagepreferencesPackageImpl();
 
 		isInited = true;
 
@@ -104,7 +100,6 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 		// Mark meta-data to indicate it can't be changed
 		thelanguagepreferencesPackage.freeze();
 
-
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(languagepreferencesPackage.eNS_URI, thelanguagepreferencesPackage);
 		return thelanguagepreferencesPackage;
@@ -113,7 +108,6 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getLanguage() {
@@ -123,27 +117,24 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getLanguage_Name() {
-		return (EAttribute) languageEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)languageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getLanguage_PreferedEditor() {
-		return (EReference) languageEClass.getEStructuralFeatures().get(1);
+		return (EReference)languageEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getEditor() {
@@ -153,17 +144,24 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EAttribute getEditor_Class() {
-		return (EAttribute) editorEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)editorEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getEditor_BundleId() {
+		return (EAttribute)editorEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EClass getPreferences() {
@@ -173,63 +171,55 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getPreferences_Languages() {
-		return (EReference) preferencesEClass.getEStructuralFeatures().get(0);
+		return (EReference)preferencesEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getPreferences_Editors() {
-		return (EReference) preferencesEClass.getEStructuralFeatures().get(1);
+		return (EReference)preferencesEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EReference getPreferences_DefaultEditor() {
-		return (EReference) preferencesEClass.getEStructuralFeatures().get(2);
+		return (EReference)preferencesEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public languagepreferencesFactory getlanguagepreferencesFactory() {
-		return (languagepreferencesFactory) getEFactoryInstance();
+		return (languagepreferencesFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is
+	 * 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;
-		}
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -239,6 +229,7 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 
 		editorEClass = createEClass(EDITOR);
 		createEAttribute(editorEClass, EDITOR__CLASS);
+		createEAttribute(editorEClass, EDITOR__BUNDLE_ID);
 
 		preferencesEClass = createEClass(PREFERENCES);
 		createEReference(preferencesEClass, PREFERENCES__LANGUAGES);
@@ -249,23 +240,19 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model. This
+	 * 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;
-		}
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -280,17 +267,18 @@ public class languagepreferencesPackageImpl extends EPackageImpl implements lang
 		// Add supertypes to classes
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(languageEClass, Language.class, "Language", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLanguage_Name(), ecorePackage.getEString(), "name", null, 1, 1, Language.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLanguage_PreferedEditor(), this.getEditor(), null, "preferedEditor", null, 0, 1, Language.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(editorEClass, Editor.class, "Editor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEditor_Class(), ecorePackage.getEString(), "class", null, 1, 1, Editor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(preferencesEClass, Preferences.class, "Preferences", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPreferences_Languages(), this.getLanguage(), null, "languages", null, 0, -1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPreferences_Editors(), this.getEditor(), null, "editors", null, 0, -1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPreferences_DefaultEditor(), this.getEditor(), null, "defaultEditor", null, 1, 1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(languageEClass, Language.class, "Language", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getLanguage_Name(), ecorePackage.getEString(), "name", null, 1, 1, Language.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLanguage_PreferedEditor(), this.getEditor(), null, "preferedEditor", null, 0, 1, Language.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(editorEClass, Editor.class, "Editor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getEditor_Class(), ecorePackage.getEString(), "class", null, 1, 1, Editor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getEditor_BundleId(), ecorePackage.getEString(), "bundleId", null, 0, 1, Editor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(preferencesEClass, Preferences.class, "Preferences", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getPreferences_Languages(), this.getLanguage(), null, "languages", null, 0, -1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPreferences_Editors(), this.getEditor(), null, "editors", null, 0, -1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPreferences_DefaultEditor(), this.getEditor(), null, "defaultEditor", null, 1, 1, Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesFactory.java
index f83bdfdf1ec..291f9b18408 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesFactory.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EFactory;
  * 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.uml.properties.languagepreferences.languagepreferencesPackage
  * @generated
  */
@@ -22,7 +21,6 @@ public interface languagepreferencesFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	languagepreferencesFactory eINSTANCE = org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesFactoryImpl.init();
@@ -31,7 +29,6 @@ public interface languagepreferencesFactory extends EFactory {
 	 * Returns a new object of class '<em>Language</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Language</em>'.
 	 * @generated
 	 */
@@ -41,7 +38,6 @@ public interface languagepreferencesFactory extends EFactory {
 	 * Returns a new object of class '<em>Editor</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Editor</em>'.
 	 * @generated
 	 */
@@ -51,7 +47,6 @@ public interface languagepreferencesFactory extends EFactory {
 	 * Returns a new object of class '<em>Preferences</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Preferences</em>'.
 	 * @generated
 	 */
@@ -61,7 +56,6 @@ public interface languagepreferencesFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesPackage.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesPackage.java
index 32b5f972251..df21a62dbd4 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesPackage.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/languagepreferencesPackage.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesFactory
  * @model kind="package"
  * @generated
@@ -32,7 +31,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNAME = "languagepreferences";
@@ -41,7 +39,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/papyrus/properties/uml/languagePreferences";
@@ -50,7 +47,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	String eNS_PREFIX = "lgpref";
@@ -59,7 +55,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	languagepreferencesPackage eINSTANCE = org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl.init();
@@ -68,7 +63,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl <em>Language</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getLanguage()
 	 * @generated
@@ -79,7 +73,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -89,7 +82,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Prefered Editor</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -99,7 +91,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The number of structural features of the '<em>Language</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -109,7 +100,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl <em>Editor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getEditor()
 	 * @generated
@@ -120,27 +110,33 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Class</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
 	int EDITOR__CLASS = 0;
 
 	/**
+	 * The feature id for the '<em><b>Bundle Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDITOR__BUNDLE_ID = 1;
+
+	/**
 	 * The number of structural features of the '<em>Editor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
-	int EDITOR_FEATURE_COUNT = 1;
+	int EDITOR_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl <em>Preferences</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getPreferences()
 	 * @generated
@@ -151,7 +147,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Languages</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -161,7 +156,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Editors</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -171,7 +165,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The feature id for the '<em><b>Default Editor</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -181,7 +174,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * The number of structural features of the '<em>Preferences</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -192,7 +184,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language <em>Language</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Language</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Language
 	 * @generated
@@ -203,7 +194,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Language#getName()
 	 * @see #getLanguage()
@@ -215,7 +205,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Language#getPreferedEditor <em>Prefered Editor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the reference '<em>Prefered Editor</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Language#getPreferedEditor()
 	 * @see #getLanguage()
@@ -227,7 +216,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor <em>Editor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Editor</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Editor
 	 * @generated
@@ -238,7 +226,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getClass_ <em>Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Class</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getClass_()
 	 * @see #getEditor()
@@ -247,10 +234,20 @@ public interface languagepreferencesPackage extends EPackage {
 	EAttribute getEditor_Class();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getBundleId <em>Bundle Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Bundle Id</em>'.
+	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Editor#getBundleId()
+	 * @see #getEditor()
+	 * @generated
+	 */
+	EAttribute getEditor_BundleId();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences <em>Preferences</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for class '<em>Preferences</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Preferences
 	 * @generated
@@ -261,7 +258,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getLanguages <em>Languages</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference list '<em>Languages</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getLanguages()
 	 * @see #getPreferences()
@@ -273,7 +269,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getEditors <em>Editors</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the containment reference list '<em>Editors</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getEditors()
 	 * @see #getPreferences()
@@ -285,7 +280,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getDefaultEditor <em>Default Editor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the reference '<em>Default Editor</em>'.
 	 * @see org.eclipse.papyrus.uml.properties.languagepreferences.Preferences#getDefaultEditor()
 	 * @see #getPreferences()
@@ -297,7 +291,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * 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
 	 */
@@ -313,7 +306,6 @@ public interface languagepreferencesPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	interface Literals {
@@ -321,7 +313,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl <em>Language</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.LanguageImpl
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getLanguage()
 		 * @generated
@@ -332,7 +323,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute LANGUAGE__NAME = eINSTANCE.getLanguage_Name();
@@ -341,7 +331,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Prefered Editor</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference LANGUAGE__PREFERED_EDITOR = eINSTANCE.getLanguage_PreferedEditor();
@@ -350,7 +339,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl <em>Editor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.EditorImpl
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getEditor()
 		 * @generated
@@ -361,16 +349,22 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Class</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute EDITOR__CLASS = eINSTANCE.getEditor_Class();
 
 		/**
+		 * The meta object literal for the '<em><b>Bundle Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EDITOR__BUNDLE_ID = eINSTANCE.getEditor_BundleId();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl <em>Preferences</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.PreferencesImpl
 		 * @see org.eclipse.papyrus.uml.properties.languagepreferences.impl.languagepreferencesPackageImpl#getPreferences()
 		 * @generated
@@ -381,7 +375,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Languages</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference PREFERENCES__LANGUAGES = eINSTANCE.getPreferences_Languages();
@@ -390,7 +383,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Editors</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference PREFERENCES__EDITORS = eINSTANCE.getPreferences_Editors();
@@ -399,7 +391,6 @@ public interface languagepreferencesPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Default Editor</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EReference PREFERENCES__DEFAULT_EDITOR = eINSTANCE.getPreferences_DefaultEditor();
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesAdapterFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesAdapterFactory.java
index 173e971ade7..f365b040536 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesAdapterFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesAdapterFactory.java
@@ -10,6 +10,7 @@ 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.uml.properties.languagepreferences.*;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Editor;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Language;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Preferences;
@@ -20,7 +21,6 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * 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.uml.properties.languagepreferences.languagepreferencesPackage
  * @generated
  */
@@ -29,7 +29,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static languagepreferencesPackage modelPackage;
@@ -38,7 +37,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public languagepreferencesAdapterFactory() {
@@ -52,7 +50,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- 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
 	 */
@@ -62,7 +59,7 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -71,45 +68,39 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected languagepreferencesSwitch<Adapter> modelSwitch =
 			new languagepreferencesSwitch<Adapter>() {
-				@Override
-				public Adapter caseLanguage(Language object) {
-					return createLanguageAdapter();
-				}
-
-				@Override
-				public Adapter caseEditor(Editor object) {
-					return createEditorAdapter();
-				}
-
-				@Override
-				public Adapter casePreferences(Preferences object) {
-					return createPreferencesAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
+			@Override
+			public Adapter caseLanguage(Language object) {
+				return createLanguageAdapter();
+			}
+			@Override
+			public Adapter caseEditor(Editor object) {
+				return createEditorAdapter();
+			}
+			@Override
+			public Adapter casePreferences(Preferences object) {
+				return createPreferencesAdapter();
+			}
+			@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.
+	 * @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);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 
@@ -119,7 +110,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * 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.uml.properties.languagepreferences.Language
 	 * @generated
@@ -134,7 +124,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * 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.uml.properties.languagepreferences.Editor
 	 * @generated
@@ -149,7 +138,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * 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.uml.properties.languagepreferences.Preferences
 	 * @generated
@@ -163,7 +151,6 @@ public class languagepreferencesAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesSwitch.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesSwitch.java
index d46bab5b44c..ff05b61639f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesSwitch.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src-gen/org/eclipse/papyrus/uml/properties/languagepreferences/util/languagepreferencesSwitch.java
@@ -9,6 +9,7 @@ package org.eclipse.papyrus.uml.properties.languagepreferences.util;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.uml.properties.languagepreferences.*;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Editor;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Language;
 import org.eclipse.papyrus.uml.properties.languagepreferences.Preferences;
@@ -23,7 +24,6 @@ import org.eclipse.papyrus.uml.properties.languagepreferences.languagepreference
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.papyrus.uml.properties.languagepreferences.languagepreferencesPackage
  * @generated
  */
@@ -32,7 +32,6 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected static languagepreferencesPackage modelPackage;
@@ -41,7 +40,6 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public languagepreferencesSwitch() {
@@ -54,8 +52,7 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -68,39 +65,31 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * 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 languagepreferencesPackage.LANGUAGE: {
-			Language language = (Language) theEObject;
-			T result = caseLanguage(language);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case languagepreferencesPackage.LANGUAGE: {
+				Language language = (Language)theEObject;
+				T result = caseLanguage(language);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case languagepreferencesPackage.EDITOR: {
-			Editor editor = (Editor) theEObject;
-			T result = caseEditor(editor);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case languagepreferencesPackage.EDITOR: {
+				Editor editor = (Editor)theEObject;
+				T result = caseEditor(editor);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		case languagepreferencesPackage.PREFERENCES: {
-			Preferences preferences = (Preferences) theEObject;
-			T result = casePreferences(preferences);
-			if (result == null) {
-				result = defaultCase(theEObject);
+			case languagepreferencesPackage.PREFERENCES: {
+				Preferences preferences = (Preferences)theEObject;
+				T result = casePreferences(preferences);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
 			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			default: return defaultCase(theEObject);
 		}
 	}
 
@@ -110,9 +99,7 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Language</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -127,9 +114,7 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Editor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -144,9 +129,7 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
+	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Preferences</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -161,9 +144,7 @@ public class languagepreferencesSwitch<T> extends Switch<T> {
 	 * 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.
+	 * @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
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
index 4d5516b819a..8a7f10ff018 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/extensionpoint/LanguageEditorExtensionPoint.java
@@ -42,11 +42,11 @@ public class LanguageEditorExtensionPoint {
 		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
 
 		for (IConfigurationElement e : config) {
-			String languageName = e.getAttribute("language"); //$NON-NLS-1$
-			String editorClassName = e.getAttribute("editor"); //$NON-NLS-1$
-
-			Editor editor = languagepreferencesFactory.eINSTANCE.createEditor();
+			final String languageName = e.getAttribute("language"); //$NON-NLS-1$
+			final String editorClassName = e.getAttribute("editor"); //$NON-NLS-1$
+			final Editor editor = languagepreferencesFactory.eINSTANCE.createEditor();
 			editor.setClass(editorClassName);
+			editor.setBundleId(e.getContributor().getName());
 			LanguageRegistry.instance.registerEditor(languageName, editor);
 		}
 	}
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
index 1d4913504ce..cbdd2fd0cd9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/preferences/LanguageRegistry.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2011, 2014 CEA LIST and others.
+ * Copyright (c) 2011, 2014, 2019 CEA LIST and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -11,7 +11,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus (CEA) - bug 422257
- *
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 553247
  *****************************************************************************/
 package org.eclipse.papyrus.uml.properties.preferences;
 
@@ -44,13 +44,17 @@ import org.eclipse.papyrus.uml.properties.widgets.BodyEditor;
  */
 public class LanguageRegistry {
 
+	private Map<String, List<Editor>> languageMapping;
+
+	private Preferences preferences;
+
 	/**
 	 * The singleton instance for the LanguageRegistry
 	 */
 	public static final LanguageRegistry instance = new LanguageRegistry();
 
 	private LanguageRegistry() {
-		languageMapping = new HashMap<String, List<Editor>>();
+		languageMapping = new HashMap<>();
 
 		IPath path = Activator.getDefault().getPreferencesPath();
 		String preferencesPath = path.toString() + "/languagePreferences.xmi"; //$NON-NLS-1$
@@ -75,6 +79,7 @@ public class LanguageRegistry {
 		preferences = languagepreferencesFactory.eINSTANCE.createPreferences();
 		Editor defaultEditor = languagepreferencesFactory.eINSTANCE.createEditor();
 		defaultEditor.setClass("org.eclipse.papyrus.uml.properties.widgets.NaturalLanguageEditor"); //$NON-NLS-1$
+		defaultEditor.setBundleId(Activator.PLUGIN_ID);
 
 		preferences.getEditors().add(defaultEditor);
 		preferences.setDefaultEditor(defaultEditor);
@@ -176,22 +181,24 @@ public class LanguageRegistry {
 		return language;
 	}
 
-	private BodyEditor getInstance(Editor editor) {
-		String className = editor.getClass_();
-		return ClassLoaderHelper.newInstance(className, BodyEditor.class);
+	/**
+	 *
+	 * @param editor
+	 *            the editor to load
+	 * @return
+	 *         a new instance of the editor
+	 */
+	private BodyEditor getInstance(final Editor editor) {
+		return ClassLoaderHelper.newInstance(editor.getClass_(), BodyEditor.class, editor.getBundleId());
 	}
 
-	private Map<String, List<Editor>> languageMapping;
-
-	private Preferences preferences;
-
 	/**
 	 *
 	 * @return the list of all known languages
 	 */
 	public List<String> getLanguages() {
-		List<String> result = new LinkedList<String>(languageMapping.keySet());
-		result.remove(""); //$NON-NLS-1$
+		List<String> result = new LinkedList<>(languageMapping.keySet());
+		result.remove(""); //$NON-NLS-1$ the default editor is register with empty string as key
 		Collections.sort(result);
 		return result;
 	}